diff --git a/doomclassic/doom/d_main.h b/doomclassic/doom/d_main.h index 455c48c9..cde4c435 100644 --- a/doomclassic/doom/d_main.h +++ b/doomclassic/doom/d_main.h @@ -66,9 +66,9 @@ void D_PageDrawer (void); void D_AdvanceDemo (void); void D_StartTitle (void); -#define R_OK 0x01 -#define X_OK 0x02 -#define W_OK 0x04 +//#define R_OK 0x01 +//#define X_OK 0x02 +//#define W_OK 0x04 int access(char* name, int val); diff --git a/neo/framework/common_frame.cpp b/neo/framework/common_frame.cpp index 62362fd4..0441c5e2 100644 --- a/neo/framework/common_frame.cpp +++ b/neo/framework/common_frame.cpp @@ -408,7 +408,7 @@ This is an out-of-sequence screen update, not the normal game rendering // DG: added possibility to *not* release mouse in UpdateScreen(), it fucks up the view angle for screenshots void idCommonLocal::UpdateScreen( bool captureToImage, bool releaseMouse ) { - if( insideUpdateScreen ) + if( insideUpdateScreen || com_shuttingDown ) { return; } diff --git a/neo/idlib/MapFile.cpp b/neo/idlib/MapFile.cpp index f00138b9..b91f1a10 100644 --- a/neo/idlib/MapFile.cpp +++ b/neo/idlib/MapFile.cpp @@ -2207,6 +2207,24 @@ void MapPolygonMesh::ConvertFromBrush( const idMapBrush* mapBrush, int entityNum st.x = ( xyz * texVec[0].ToVec3() ) + texVec[0][3]; st.y = ( xyz * texVec[1].ToVec3() ) + texVec[1][3]; + // support Valve 220 projection + if( mapSide->GetProjectionType() == idMapBrushSide::PROJECTION_VALVE220 ) + { + const idMaterial* material = declManager->FindMaterial( mapSide->GetMaterial() ); + + idVec2i texSize = mapSide->GetTextureSize(); + + idImage* image = material->GetEditorImage(); + if( image != NULL ) + { + texSize.x = image->GetUploadWidth(); + texSize.y = image->GetUploadHeight(); + } + + st.x /= texSize[0]; + st.y /= texSize[1]; + } + // flip y //st.y = 1.0f - st.y; diff --git a/neo/renderer/Material.h b/neo/renderer/Material.h index 0d71148c..756da03a 100644 --- a/neo/renderer/Material.h +++ b/neo/renderer/Material.h @@ -239,11 +239,11 @@ struct stencilStage_t // (if either Pass, Fail or ZFail is set to replace). byte ref = 0; - // An 8 bit mask as an 0–255 integer, used when comparing the reference value with the contents of the buffer + // An 8 bit mask as an 0�255 integer, used when comparing the reference value with the contents of the buffer // (referenceValue & readMask) comparisonFunction (stencilBufferValue & readMask). byte readMask = 255; - // An 8 bit mask as an 0–255 integer, used when writing to the buffer.Note that, like other write masks, + // An 8 bit mask as an 0�255 integer, used when writing to the buffer.Note that, like other write masks, // it specifies which bits of stencil buffer will be affected by write // (i.e.WriteMask 0 means that no bits are affected and not that 0 will be written). byte writeMask = 255; diff --git a/neo/renderer/RenderProgs_embedded.h b/neo/renderer/RenderProgs_embedded.h index 644f9817..820f15e0 100644 --- a/neo/renderer/RenderProgs_embedded.h +++ b/neo/renderer/RenderProgs_embedded.h @@ -609,7 +609,7 @@ static const cgShaderDef_t cg_renderprogs[] = " *\n" " * The shader has three passes, chained together as follows:\n" " *\n" - " * |input|------------------·\n" + " * |input|------------------\n" " * v |\n" " * [ SMAA*EdgeDetection ] |\n" " * v |\n" @@ -619,7 +619,7 @@ static const cgShaderDef_t cg_renderprogs[] = " * v |\n" " * |blendTex| |\n" " * v |\n" - " * [ SMAANeighborhoodBlending ] <------·\n" + " * [ SMAANeighborhoodBlending ] <------\n" " * v\n" " * |output|\n" " *\n" @@ -2072,7 +2072,7 @@ static const cgShaderDef_t cg_renderprogs[] = "}\n" "\n" "// Fresnel term F( v, h )\n" - "// Fnone( v, h ) = F(0°) = specularColor\n" + "// Fnone( v, h ) = F(0) = specularColor\n" "half3 Fresnel_Schlick( half3 specularColor, half vDotN )\n" "{\n" " return specularColor + ( 1.0 - specularColor ) * pow( 1.0 - vDotN, 5.0 );\n" diff --git a/neo/sys/sdl/sdl_events.cpp b/neo/sys/sdl/sdl_events.cpp index a2e4e66e..a894309b 100644 --- a/neo/sys/sdl/sdl_events.cpp +++ b/neo/sys/sdl/sdl_events.cpp @@ -1708,8 +1708,12 @@ sysEvent_t Sys_GetEvent() common->Warning( "unknown user event %u", ev.user.code ); } continue; // just handle next event + + case SDL_KEYMAPCHANGED: + continue; // just handle next event + default: - common->Warning( "unknown event %u", ev.type ); + common->Warning( "unknown event %u = %#x", ev.type, ev.type ); continue; // just handle next event } } diff --git a/neo/tools/compilers/dmap/dmap.cpp b/neo/tools/compilers/dmap/dmap.cpp index f80d6dbc..47068565 100644 --- a/neo/tools/compilers/dmap/dmap.cpp +++ b/neo/tools/compilers/dmap/dmap.cpp @@ -409,6 +409,14 @@ void Dmap( const idCmdArgs& args ) idStr generated = va( "generated/%s.bproc", dmapGlobals.mapFileBase ); fileSystem->RemoveFile( generated.c_str() ); + // delete any old generated binary cm files + generated = va( "generated/%s.bcm", dmapGlobals.mapFileBase ); + fileSystem->RemoveFile( generated.c_str() ); + + // delete any old ASCII collision files + idStr::snPrintf( path, sizeof( path ), "%s.cm", dmapGlobals.mapFileBase ); + fileSystem->RemoveFile( path ); + // // start from scratch //