diff --git a/GameVersion.cpp b/GameVersion.cpp index cd5cf40f..49862d7e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -15,9 +15,9 @@ #ifdef JA2EDITOR #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Unfinished Business - Map Editor v1.13.6670 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Map Editor v1.13.6670 (Development Build)" }; #endif // ------------------------------ @@ -27,11 +27,11 @@ //DEBUG BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: Unfinished Business - v1.13.6670 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: JA2 Demo - v1.13.6670 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Debug: v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Debug: v1.13.6670 (Development Build)" }; #endif #elif defined CRIPPLED_VERSION @@ -46,16 +46,16 @@ //RELEASE BUILD VERSION #ifdef JA2UB - CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release Unfinished Business - v1.13.6670 (Development Build)" }; #elif defined (JA113DEMO) - CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release JA2 Demo - v1.13.6670 (Development Build)" }; #else - CHAR16 zVersionLabel[256] = { L"Release v1.13.6513 (Development Build)" }; + CHAR16 zVersionLabel[256] = { L"Release v1.13.6670 (Development Build)" }; #endif #endif -CHAR8 czVersionNumber[16] = { "Build 13.10.19" }; //YY.MM.DD +CHAR8 czVersionNumber[16] = { "Build 13.11.30" }; //YY.MM.DD CHAR16 zTrackingNumber[16] = { L"Z" }; // SAVE_GAME_VERSION is defined in header, change it there diff --git a/TileEngine/worlddef.cpp b/TileEngine/worlddef.cpp index adac13d8..124a099e 100644 --- a/TileEngine/worlddef.cpp +++ b/TileEngine/worlddef.cpp @@ -4256,7 +4256,7 @@ void LoadMapLights( INT8 **hBuffer ) iLSprite = LightSpriteCreate( str, TmpLight.uiLightType ); //if this fails, then we will ignore the light. // ATE: Don't add ANY lights of mapscreen util is on - if( iLSprite != -1 && guiCurrentScreen != MAPUTILITY_SCREEN ) + if( iLSprite != -1/* && guiCurrentScreen != MAPUTILITY_SCREEN*/ )//dnl ch79 301113 lights will be reset in map utility screen { if( !gfCaves || gfEditMode ) { diff --git a/Utils/MapUtility.cpp b/Utils/MapUtility.cpp index ab0c3e52..92ef8280 100644 --- a/Utils/MapUtility.cpp +++ b/Utils/MapUtility.cpp @@ -25,6 +25,7 @@ #include "Editor Taskbar Utils.h" #include "Text Input.h" #include "Cursor Control.h"//dnl ch78 271113 +#include "lighting.h"//dnl ch79 301113 #define MINIMAP_X_SIZE 88//RADAR_WINDOW_WIDTH #define MINIMAP_Y_SIZE 44//RADAR_WINDOW_HEIGHT @@ -175,13 +176,15 @@ UINT32 MapUtilScreenHandle(void) return(MAPUTILITY_SCREEN); } sprintf(zFilename, "%s", FListNode->FileInfo.zFileName); - // OK, load maps and do overhead shrinkage of them... //dnl ch79 291113 + // OK, load maps and do overhead shrinkage of them... //dnl ch79 301113 if(!LoadWorld(zFilename, &dMajorMapVersion, &ubMinorMapVersion)) return(ERROR_SCREEN); if(strcmp(gzCommandLine, "-DOMAPSCNV") == 0) if(!(dMajorMapVersion == MAJOR_MAP_VERSION && ubMinorMapVersion == MINOR_MAP_VERSION && gMapInformation.ubMapVersion == MINOR_MAP_VERSION)) if(!SaveWorld(zFilename)) return(ERROR_SCREEN); + LightReset(); + LightSpriteRenderAll(); } // Render small map //iOffsetHorizontal = (SCREEN_WIDTH / 2) - (640 / 2);// Horizontal start postion of the overview map