1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Space Viking's many mercs changes plus numerous generic bug fixes

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
SpaceViking
2009-01-15 01:26:13 +00:00
parent f64f58fbf8
commit f26095d86f
138 changed files with 3493 additions and 3265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jascreens.cpp
+23 -12
View File
@@ -58,6 +58,7 @@
#include "Multi Language Graphic Utils.h"
#include "text.h"
#include "Language Defines.h"
#include "IniReader.h"
#endif
#define _UNICODE
@@ -281,14 +282,14 @@ UINT32 ErrorScreenHandle(void)
SetFont( LARGEFONT1 );
SetFontBackground( FONT_MCOLOR_BLACK );
SetFontForeground( FONT_MCOLOR_LTGRAY );
mprintf( 50, 200, L"RUNTIME ERROR" );
mprintf( 50, 200, L"RUNTIME ERROR -- PRESS <ESC> TO EXIT" );
mprintf( 50, 225, L"PRESS <ESC> TO EXIT" );
SetFont( FONT12ARIAL );
SetFontForeground( FONT_YELLOW );
SetFontShadow( 60 ); //60 is near black
mprintf( 50, 255, L"%S", gubErrorText );
// SetFont( FONT12ARIAL );
// SetFontForeground( FONT_YELLOW );
// SetFontShadow( 60 ); //60 is near black
swprintf( str, L"%S", gubErrorText );
DisplayWrappedString (50, 225, 560, 2, FONT12ARIAL, FONT_YELLOW, str, FONT_MCOLOR_BLACK, TRUE, LEFT_JUSTIFIED);
// mprintf( 50, 255, L"%S", gubErrorText );
SetFontForeground( FONT_LTRED );
@@ -403,11 +404,7 @@ UINT32 InitScreenHandle(void)
mprintf( 10, 10, L"%s: %s %S", pMessageStrings[ MSG_VERSION ], zVersionLabel, czVersionNumber );
#endif
#ifdef CRIPPLED_VERSION
mprintf( 10, 0, L"(LIMITED PRESS PREVIEW VERSION)" );
#elif defined JA2BETAVERSION
#if defined JA2BETAVERSION
mprintf( 10, 0, L"(Beta version error reporting enabled)" );
@@ -426,6 +423,20 @@ UINT32 InitScreenHandle(void)
#endif
}
// Remove this for real release
mprintf( 10, 40, L"(Space Viking's Many Mercs beta 007n -- 29 December 2008)" );
// Handle queued .ini file error messages
int y = 40;
while (! iniErrorMessages.empty()) {
std::string iniErrorMessage = iniErrorMessages.top();
y += 10;
CHAR16 str[256];
swprintf( str, L"%S", iniErrorMessage.c_str() );
DisplayWrappedString( 10, y, 560, 2, FONT12ARIAL, FONT_RED, str, FONT_BLACK, TRUE, LEFT_JUSTIFIED );
iniErrorMessages.pop();
}
InvalidateScreen( );
// Delete video Surface