cpp/openttd-patchpack/source Changeset - r818:cfc42440f301

Changeset - r818:cfc42440f301

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

truelight - 20 years ago 2004-12-28 12:11:34
truelight@openttd.org

(svn r1289) -Fix: Minor fix for OS/2 message boxes (orudge)

2 files changed with 33 insertions and 7 deletions:

docs/Readme_OS2.txt

os2.c

0 comments (0 inline, 0 general)

docs/Readme_OS2.txt

➞

Show inline comments

@@ @@ -13,12 +13,15 @@ USING OPENTTD FOR OS/2 @@
 LIBRARIES REQUIRED FOR END USERS
 --------------------------------
 SDL.DLL (SDL 1.2.7) and FSLib.dll are required to use this program:
 these can be downloaded from the Files section at
 http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
 (Note that a newer version of SDL is now available at
 ftp://ftp.netlabs.org/pub/sdl/sdl-dev-os2-2004-12-22.zip which may
 help solve some problems).
 Note that to actually play the game, I have found in my own
 experience that a version of the Scitech Display Drivers or its later
 incarnation (see www.scitech.com) are necessary for it to work. If
 you have trouble with your native drivers, try the Scitech drivers
 and see if they help the problem.
@@ @@ -84,14 +87,15 @@ provided, they are not designed for Watc @@
   of date and uses EMX
 - libpng
   http://www.libpng.org/ - contains an EMX/gcc makefile
 - SDL for OS/2
   I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip -
   take SDL.dll and SDL.lib from the src/ directory.
   For 0.3.5, I used ftp://ftp.netlabs.org/pub/sdl/SDL-1.2.7-src-20040908a.zip -
   take SDL.dll and SDL.lib from the src/ directory. Note that 20041222 is
   out now, which is recommended for stability updates.
 If you do not wish to build the libraries yourself, pre-built versions
 can be downloaded from the Files section at
 http://sourceforge.net/projects/openttd/ - see "os2-useful.zip".
 Compiling

os2.c

➞

Show inline comments

@@ @@ -8,14 +8,14 @@ @@
 #include <sys/stat.h>
 #include <stdarg.h>
 #include <time.h>
 #include <dos.h>
 #define INCL_DOS
 #define INCL_WINDIALOGS
 #define INCL_OS2MM
 #define INCL_WIN
 #include <os2.h>
 #include <os2me.h>
 #if defined(WITH_SDL)
 #include <SDL.h>
@@ @@ -478,21 +478,44 @@ static void ChangeWorkingDirectory(char @@
 		*s = 0;
 		chdir(exe);
 		*s = '\\';
+	}
+}
 // for some reason these calls don't actually work properly :/
 void ShowInfo(const char *str)
+{
 	WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, str, "OpenTTD", 0, MB_OK | MB_SYSTEMMODAL | MB_MOVEABLE | MB_INFORMATION);
 	HAB hab;
 	HMQ hmq;
 	ULONG rc;
 	// init PM env.
 	hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0);
 	// display the box
 	rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, str, "OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_INFORMATION);
 	// terminate PM env.
 	WinDestroyMsgQueue(hmq);
 	WinTerminate(hab);
+}
 void ShowOSErrorBox(const char *buf)
+{
 	WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, buf, "OpenTTD", 0, MB_OK | MB_SYSTEMMODAL | MB_MOVEABLE | MB_ERROR);
 	HAB hab;
 	HMQ hmq;
 	ULONG rc;
 	// init PM env.
 	hmq = WinCreateMsgQueue((hab = WinInitialize(0)), 0);
 	// display the box
 	rc = WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, buf, "OpenTTD", 0, MB_OK | MB_MOVEABLE | MB_ERROR);
 	// terminate PM env.
 	WinDestroyMsgQueue(hmq);
 	WinTerminate(hab);
+}
 int CDECL main(int argc, char* argv[])
+{
 	// change the working directory to enable doubleclicking in UIs
 	ChangeWorkingDirectory(argv[0]);
@@ @@ -585,13 +608,12 @@ void OS2_SwitchToConsoleMode() @@
 	DosGetInfoBlocks(&tib, &pib);
 	// Change flag from PM to VIO
 	pib->pib_ultype = 3;
+}
 /**********************
  * OS/2 MIDI PLAYER
  **********************/
 /* Interesting how similar the MCI API in OS/2 is to the Win32 MCI API,
  * eh? Anyone would think they both came from the same place originally! ;)

0 comments (0 inline, 0 general)