Mercurial > hg > dmlib
annotate src/dmsimple.c @ 1321:6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
struct to local global variables in dmsimple.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 21 Aug 2017 15:35:26 +0300 |
parents | 132706e3b94b |
children | a265982662cd |
rev | line source |
---|---|
642
0888971cbff8
Add comment headers to several files.
Matti Hamalainen <ccr@tnsp.org>
parents:
641
diff
changeset
|
1 /* |
0888971cbff8
Add comment headers to several files.
Matti Hamalainen <ccr@tnsp.org>
parents:
641
diff
changeset
|
2 * dmlib |
0888971cbff8
Add comment headers to several files.
Matti Hamalainen <ccr@tnsp.org>
parents:
641
diff
changeset
|
3 * -- Demo engine "player" code |
0888971cbff8
Add comment headers to several files.
Matti Hamalainen <ccr@tnsp.org>
parents:
641
diff
changeset
|
4 * Programmed and designed by Matti 'ccr' Hamalainen |
863 | 5 * (C) Copyright 2012-2015 Tecnic Software productions (TNSP) |
642
0888971cbff8
Add comment headers to several files.
Matti Hamalainen <ccr@tnsp.org>
parents:
641
diff
changeset
|
6 */ |
310
713c8018c3ce
Fix includes in the dmsimple engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
278
diff
changeset
|
7 #include <SDL.h> |
967
b387481e511e
Remember to initialize dmzlib in the engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
962
diff
changeset
|
8 #include "dmzlib.h" |
342
c6ec970dc3cf
Separate some demo engine parts to two different modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
9 #include "dmengine.h" |
310
713c8018c3ce
Fix includes in the dmsimple engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
278
diff
changeset
|
10 #include "dmargs.h" |
593 | 11 #include "dmtext.h" |
12 #include "dmimage.h" | |
591
f165883c2ea6
#include the default setup image and font.
Matti Hamalainen <ccr@tnsp.org>
parents:
578
diff
changeset
|
13 #include "setupfont.h" |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
14 |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
15 #ifdef DM_BUILT_IN_SETUP |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
16 # include "setupimage.h" |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
17 # include "setupmenubar.h" |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
18 #endif |
591
f165883c2ea6
#include the default setup image and font.
Matti Hamalainen <ccr@tnsp.org>
parents:
578
diff
changeset
|
19 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
20 // Setup specifics |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
21 #define setupTextFieldLen 64 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
22 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
23 static const char *setupDataName = "SetupData.txt"; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
24 static const char *setupFontName = "SetupFont.dmf"; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
25 static DMVector |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
26 setupMenuPos, setupMenuDim, setupText1Pos, setupText2Pos, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
27 setupMenuBarOffs, setupMenuBarDimAdj; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
28 static BOOL setupMenuCenter, setupTextCondensed; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
29 static char |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
30 setupTextFullscreen[setupTextFieldLen], |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
31 setupTextWindowed[setupTextFieldLen], |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
32 setupTextPrefix[setupTextFieldLen], |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
33 setupTextEnterToStart[setupTextFieldLen], |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
34 setupImageName[setupTextFieldLen] = "SetupImage.png", |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
35 setupMenuBarName[setupTextFieldLen] = "SetupMenuBar.png"; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
36 |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
37 |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
38 // Engine struct |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
39 static DMEngineData engine; |
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
40 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
41 |
861
15b413845e24
Oops, few dmargs* API changes related fixes were missing.
Matti Hamalainen <ccr@tnsp.org>
parents:
850
diff
changeset
|
42 static const DMOptArg optList[] = |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
43 { |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
44 { 0, '?', "help", "Show this help", OPT_NONE }, |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
45 { 1, 'v', "verbose", "Be more verbose", OPT_NONE }, |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
46 }; |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
47 |
861
15b413845e24
Oops, few dmargs* API changes related fixes were missing.
Matti Hamalainen <ccr@tnsp.org>
parents:
850
diff
changeset
|
48 static const int optListN = sizeof(optList) / sizeof(optList[0]); |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
49 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
50 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
51 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
52 static void argShowHelp() |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
53 { |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
54 dmPrintBanner(stdout, dmProgName, "[options]"); |
861
15b413845e24
Oops, few dmargs* API changes related fixes were missing.
Matti Hamalainen <ccr@tnsp.org>
parents:
850
diff
changeset
|
55 dmArgsPrintHelp(stdout, optList, optListN, 0); |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
56 } |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
57 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
58 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
59 static BOOL argHandleOpt(const int optN, char *optArg, char *currArg) |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
60 { |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
61 (void) optArg; |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
62 (void) currArg; |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
63 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
64 switch (optN) |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
65 { |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
66 case 0: |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
67 argShowHelp(); |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
68 exit(0); |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
69 break; |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
70 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
71 case 1: |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
72 dmVerbosity++; |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
73 break; |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
74 |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
75 default: |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
76 dmErrorDBGMsg("Unknown option '%s'.\n", currArg); |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
77 return FALSE; |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
78 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
79 |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
80 return TRUE; |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
81 } |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
82 |
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
83 |
342
c6ec970dc3cf
Separate some demo engine parts to two different modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
84 static int engineShowProgress(int loaded, int total) |
40 | 85 { |
86 int dx = 60, | |
87 dh = 20, | |
88 dw = engine.screen->w - (2 * dx), | |
89 dy = (engine.screen->h - dh) / 2; | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
90 |
40 | 91 if (SDL_MUSTLOCK(engine.screen) != 0 && SDL_LockSurface(engine.screen) != 0) |
92 return DMERR_INIT_FAIL; | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
93 |
40 | 94 // Draw the progress bar |
95 dmClearSurface(engine.screen, dmMapRGBA(engine.screen, 0,0,0,0)); | |
96 dmFillRect(engine.screen, dx, dy, dx+dw, dy+dh, dmMapRGB(engine.screen, 255,255,255)); | |
97 dmFillRect(engine.screen, dx+1, dy+1, dx+dw-1, dy+dh-1, dmMapRGB(engine.screen, 0,0,0)); | |
98 | |
99 if (total > 0) | |
100 { | |
101 dmFillRect(engine.screen, | |
102 dx+3, dy+3, | |
103 dx + 3 + ((dw - 3) * loaded) / total, | |
104 dy + dh - 3, | |
105 dmMapRGB(engine.screen, 200,200,200)); | |
106 } | |
107 | |
108 // Flip screen | |
109 if (SDL_MUSTLOCK(engine.screen) != 0) | |
110 SDL_UnlockSurface(engine.screen); | |
111 | |
112 SDL_Flip(engine.screen); | |
113 return DMERR_OK; | |
114 } | |
115 | |
116 | |
342
c6ec970dc3cf
Separate some demo engine parts to two different modules.
Matti Hamalainen <ccr@tnsp.org>
parents:
336
diff
changeset
|
117 static int engineLoadResources() |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
118 { |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
119 int err, loaded = 0, total = 0; |
617
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
120 BOOL first = TRUE; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
121 |
617
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
122 do |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
123 { |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
124 // Show a nice progress bar while loading |
617
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
125 if ((err = engineShowProgress(loaded, total)) != DMERR_OK) |
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
126 return err; |
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
127 |
721
bb14d7907eb2
Rename many pack & resource handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
128 err = dmResourcesPreload(engine.resources, first, &loaded, &total); |
617
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
129 first = FALSE; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
130 } |
617
35c4fecad3fc
Improve resource loading screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
616
diff
changeset
|
131 while (err == DMERR_PROGRESS); |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
132 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
133 return err; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
134 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
135 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
136 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
137 static BOOL engineGenInitializeVideo(int width, int height, int depth, Uint32 flags) |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
138 { |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
139 dmPrint(1, "Initializing SDL video %d x %d x %dbpp, flags=0x%08x\n", |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
140 width, height, depth, flags); |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
141 |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
142 SDL_FreeSurface(engine.screen); |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
143 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
144 engine.screen = SDL_SetVideoMode(width, height, depth, flags); |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
145 if (engine.screen == NULL) |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
146 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
147 dmError(DMERR_INIT_FAIL, |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
148 "Can't SDL_SetVideoMode(): %s\n", SDL_GetError()); |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
149 return FALSE; |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
150 } |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
151 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
152 SDL_WM_SetCaption(dmProgDesc, dmProgName); |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
153 |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
154 return TRUE; |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
155 } |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
156 |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
157 |
593 | 158 static BOOL engineInitializeVideo() |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
159 { |
593 | 160 return engineGenInitializeVideo(engine.optVidWidth, engine.optVidHeight, |
161 engine.optVidDepth, engine.optVFlags); | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
162 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
163 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
164 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
165 typedef struct |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
166 { |
620 | 167 int w, h, aspect; |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
168 } DMModeEntry; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
169 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
170 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
171 DMModeEntry *engineModeList = NULL; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
172 int nengineModeList = 0, aengineModeList = 0; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
173 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
174 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
175 static int engineModeSort(const void *pa, const void *pb) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
176 { |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
177 DMModeEntry |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
178 *va = (DMModeEntry *) pa, |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
179 *vb = (DMModeEntry *) pb; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
180 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
181 return (va->w - vb->w); |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
182 } |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
183 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
184 |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
185 int engineAddModeToList(int w, int h) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
186 { |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
187 DMModeEntry *mode; |
787 | 188 int i, aspect = engineGetVideoAspect(w, h); |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
189 |
787 | 190 dmPrint(2, " - Proposed %d x %d\n", w, h); |
620 | 191 if (aspect <= 0) |
192 return DMERR_INVALID_ARGS; | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
193 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
194 // Check if the mode is already in our list |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
195 for (i = 0; i < nengineModeList; i++) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
196 { |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
197 mode = &engineModeList[i]; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
198 if (mode->w == w && mode->h == h) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
199 return DMERR_OK; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
200 } |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
201 |
620 | 202 // Check if the mode fits our criteria |
203 switch (engine.optVidSetup) | |
204 { | |
205 case DM_VSETUP_ASPECT: | |
206 if (aspect != engine.optVidAspect) | |
207 return DMERR_OK; | |
208 break; | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
209 |
620 | 210 case DM_VSETUP_ANY: |
211 break; | |
212 } | |
213 | |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
214 // Reallocate array if needed |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
215 if (nengineModeList + 1 >= aengineModeList) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
216 { |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
217 aengineModeList += 16; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
218 engineModeList = dmRealloc(engineModeList, sizeof(DMModeEntry) * aengineModeList); |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
219 if (engineModeList == NULL) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
220 return DMERR_MALLOC; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
221 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
222 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
223 // Store |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
224 mode = &engineModeList[nengineModeList]; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
225 mode->w = w; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
226 mode->h = h; |
620 | 227 mode->aspect = engineGetVideoAspect(w, h); |
787 | 228 dmPrint(2, " - %d x %d, %d\n", w, h, mode->aspect); |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
229 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
230 nengineModeList++; |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
231 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
232 return DMERR_OK; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
233 } |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
234 |
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
600
diff
changeset
|
235 |
623 | 236 int engineParseSetupConfig(const char *filename) |
237 { | |
238 DMResource *file = NULL; | |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
239 int res; |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
240 char buf[256]; |
623 | 241 |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
242 if ((res = dmf_open(engine.resources, filename, &file)) != DMERR_OK) |
1055 | 243 { |
244 dmErrorMsg("Failed to open engine setup configuration '%s', %d: %s.\n", | |
245 filename, res, dmErrorStr(res)); | |
733 | 246 return res; |
1055 | 247 } |
623 | 248 |
249 while (dmfgets(buf, sizeof(buf), file) != NULL) | |
250 { | |
251 ssize_t pos; | |
252 // Trim line ending | |
253 for (pos = strlen(buf) - 1; pos >= 0 && isspace(buf[pos]); pos--) | |
254 buf[pos] = 0; | |
255 | |
256 // Find start of the line | |
257 for (pos = 0; isspace(buf[pos]); pos++); | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
258 |
623 | 259 // Skip empty lines and comments |
260 if (buf[pos] == 0 || buf[pos] == '#') | |
261 continue; | |
262 | |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
263 // XXX TODO FIXME: Needs better parsing, with size checks etc. |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
264 char *str = buf+pos; |
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
265 if (sscanf(str, "menuPos %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
266 &setupMenuPos.x, &setupMenuPos.y) != 2 && |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
267 sscanf(str, "menuDim %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
268 &setupMenuDim.x, &setupMenuDim.y) != 2 && |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
269 sscanf(str, "text1Pos %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
270 &setupText1Pos.x, &setupText1Pos.y) != 2 && |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
271 sscanf(str, "text2Pos %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
272 &setupText2Pos.x, &setupText2Pos.y) != 2 && |
848
30f9af5e80f2
Add setup data options for menu bar position/size adjustments.
Matti Hamalainen <ccr@tnsp.org>
parents:
847
diff
changeset
|
273 sscanf(str, "menuBarOffs %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
274 &setupMenuBarOffs.x, &setupMenuBarOffs.y) != 2 && |
848
30f9af5e80f2
Add setup data options for menu bar position/size adjustments.
Matti Hamalainen <ccr@tnsp.org>
parents:
847
diff
changeset
|
275 sscanf(str, "menuBarDimAdj %f %f", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
276 &setupMenuBarDimAdj.x, &setupMenuBarDimAdj.y) != 2 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
277 sscanf(str, "menuCenter %d", &setupMenuCenter) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
278 sscanf(str, "textCondensed %d", &setupTextCondensed) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
279 sscanf(str, "textFullscreen %s", setupTextFullscreen) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
280 sscanf(str, "textWindowed %s", setupTextWindowed) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
281 sscanf(str, "textPrefix %s", setupTextPrefix) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
282 sscanf(str, "textEnterToStart %s", setupTextEnterToStart) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
283 sscanf(str, "setupImageName %s", setupImageName) != 1 && |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
284 sscanf(str, "setupMenuBarName %s", setupMenuBarName) != 1 |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
285 ) |
623 | 286 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
287 res = dmErrorDBG(DMERR_INVALID_DATA, |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
288 "Syntax error in configuration:\n%s\n", buf); |
623 | 289 goto out; |
290 } | |
291 } | |
292 | |
293 out: | |
294 dmf_close(file); | |
295 return res; | |
296 } | |
297 | |
298 | |
299 static inline DMFloat vsX(DMVector vec) | |
300 { | |
301 return (DMFloat) engine.screen->w * vec.x; | |
302 } | |
303 | |
304 | |
305 static inline DMFloat vsY(DMVector vec) | |
306 { | |
307 return (DMFloat) engine.screen->h * vec.y; | |
308 } | |
309 | |
310 | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
311 int engineVideoSetup() |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
312 { |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
313 DMBitmapFont *menuFont = NULL; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
314 DMResource *file = NULL; |
608 | 315 SDL_Surface *menuBgImage = NULL, *menuBarImage = NULL; |
620 | 316 int result, menuState = -1; |
623 | 317 BOOL menuFullScreen = TRUE; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
318 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
319 // Compute a list of valid modes |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
320 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, engine.optVidDepth, engine.optVFlags)) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
321 goto out; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
322 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
323 SDL_Rect **modes = SDL_ListModes(engine.screen->format, engine.screen->flags | SDL_FULLSCREEN); |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
324 if (modes == (SDL_Rect**) 0) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
325 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
326 dmError(DMERR_INIT_FAIL, |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
327 "No compatible video resolutions/depths available at all. Bailing out.\n"); |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
328 goto out; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
329 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
330 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
331 if (modes != (SDL_Rect**) -1) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
332 { |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
333 int i; |
787 | 334 dmPrint(1, "Enumerating modes.\n"); |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
335 for (i = 0; modes[i] != NULL; i++) |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
336 engineAddModeToList(modes[i]->w, modes[i]->h); |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
337 } |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
338 |
620 | 339 if (nengineModeList == 0) |
340 { | |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
341 dmError(DMERR_INIT_FAIL, |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
342 "Umm, no modes found.\n"); |
620 | 343 goto out; |
344 } | |
345 | |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
346 qsort(engineModeList, nengineModeList, sizeof(engineModeList[0]), engineModeSort); |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
347 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
348 // Open video temporarily |
593 | 349 if (!engineGenInitializeVideo(DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT, 32, SDL_SWSURFACE | SDL_DOUBLEBUF)) |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
350 goto out; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
351 |
623 | 352 // Get setup data |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
353 setupMenuPos.x = 0.18750f; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
354 setupMenuPos.y = 0.41666f; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
355 setupMenuDim.x = 0.625f; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
356 setupMenuDim.y = 0.41666f; |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
357 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
358 setupMenuBarOffs.x = 0; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
359 setupMenuBarOffs.y = -0.0001; |
848
30f9af5e80f2
Add setup data options for menu bar position/size adjustments.
Matti Hamalainen <ccr@tnsp.org>
parents:
847
diff
changeset
|
360 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
361 setupMenuBarDimAdj.x = 0; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
362 setupMenuBarDimAdj.y = 0; |
848
30f9af5e80f2
Add setup data options for menu bar position/size adjustments.
Matti Hamalainen <ccr@tnsp.org>
parents:
847
diff
changeset
|
363 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
364 setupText1Pos.x = 0.3f; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
365 setupText1Pos.y = 0.9f; |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
366 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
367 setupText2Pos.x = 0.25f; |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
368 setupText2Pos.y = 0.85f; |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
369 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
370 strcpy(setupTextFullscreen , "FULLSCREEN"); |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
371 strcpy(setupTextWindowed , " WINDOWED "); |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
372 strcpy(setupTextEnterToStart , "ENTER TO START THE DEMO"); |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
373 strcpy(setupTextPrefix , "USE LEFT/RIGHT ARROW TO TOGGLE : "); |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
374 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
375 if (engineParseSetupConfig(setupDataName) != DMERR_OK) |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
376 goto out; |
623 | 377 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
378 // Fetch and decompress setup image, try regular resources first |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
379 if ((result = dmf_open(engine.resources, setupImageName, &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
380 #ifdef DM_BUILT_IN_SETUP |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
381 || (result = dmf_create_memio(NULL, setupImageName, setupImage, sizeof(setupImage), &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
382 #endif |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
383 ) |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
384 { |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
385 menuBgImage = dmLoadImage(file); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
386 dmf_close(file); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
387 } |
603
36b544eb6f4b
Fixes in resource management.
Matti Hamalainen <ccr@tnsp.org>
parents:
600
diff
changeset
|
388 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
389 if ((result = dmf_open(engine.resources, setupMenuBarName, &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
390 #ifdef DM_BUILT_IN_SETUP |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
391 || (result = dmf_create_memio(NULL, setupMenuBarName, setupMenuBar, sizeof(setupMenuBar), &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
392 #endif |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
393 ) |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
394 { |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
395 menuBarImage = dmLoadImage(file); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
396 dmf_close(file); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
397 } |
608 | 398 |
399 if (menuBgImage == NULL || menuBarImage == NULL) | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
400 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
401 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
402 "Could not instantiate setup screen images, %d: %s\n", |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
403 result, dmErrorStr(result)); |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
404 goto out; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
405 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
406 |
593 | 407 if (menuBgImage->w != DM_VSETUP_WIDTH || |
408 menuBgImage->h != DM_VSETUP_HEIGHT) | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
409 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
410 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
411 "Setup screen background image does not match " |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
412 "required dimensions (%dx%d vs %dx%d)\n", |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
413 menuBgImage->w, menuBgImage->h, |
593 | 414 DM_VSETUP_WIDTH, DM_VSETUP_HEIGHT); |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
415 goto out; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
416 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
417 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
418 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
419 // Load up the bitmap font |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
420 if ((result = dmf_open(engine.resources, setupFontName, &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
421 #ifdef DM_BUILT_IN_SETUP |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
422 || (result = dmf_create_memio(NULL, setupFontName, setupFont, sizeof(setupFont), &file)) == DMERR_OK |
1079
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
423 #endif |
47c0514d9ba4
Make the built in setup font/screen image/bar bitmap optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
1057
diff
changeset
|
424 ) |
730
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
425 { |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
426 result = dmLoadBitmapFont(file, &menuFont); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
427 dmf_close(file); |
3d813c81f33c
More work on resources API.
Matti Hamalainen <ccr@tnsp.org>
parents:
721
diff
changeset
|
428 } |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
429 if (result != DMERR_OK) |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
430 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
431 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
432 "Could not instantiate setup screen font, %d: %s\n", |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
433 result, dmErrorStr(result)); |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
434 goto out; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
435 } |
614
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
436 |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
437 SDL_Surface *tmp = dmConvertScaledSurface(menuBgImage, |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
438 engine.screen->format, engine.screen->flags, |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
439 engine.screen->w, engine.screen->h); |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
440 if (tmp == NULL) |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
441 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
442 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
443 "Could not convert setup screen background image.\n"); |
614
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
444 goto out; |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
445 } |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
446 |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
447 SDL_FreeSurface(menuBgImage); |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
448 menuBgImage = tmp; |
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
449 |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
450 SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL); |
620 | 451 |
452 | |
453 // Enter the main loop of the menu | |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
454 char menuStr[256]; |
620 | 455 int menuOffset = 0, |
456 menuIndex = 0, | |
457 menuEntryHeight = menuFont->height + 2, | |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
458 menuHeight = vsY(setupMenuDim) / menuEntryHeight; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
459 |
620 | 460 menuState = 0; |
461 | |
608 | 462 engine.startTime = SDL_GetTicks(); |
620 | 463 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
464 while (!menuState) |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
465 { |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
466 while (SDL_PollEvent(&engine.event)) |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
467 switch (engine.event.type) |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
468 { |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
469 case SDL_KEYDOWN: |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
470 switch (engine.event.key.keysym.sym) |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
471 { |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
472 case SDLK_ESCAPE: |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
473 menuState = -1; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
474 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
475 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
476 case SDLK_RETURN: |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
477 menuState = 1; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
478 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
479 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
480 case SDLK_UP: |
620 | 481 if (menuIndex > 0) |
482 menuIndex--; | |
483 else | |
484 if (menuOffset > 0) | |
485 menuOffset--; | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
486 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
487 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
488 case SDLK_DOWN: |
620 | 489 if (menuIndex < menuHeight - 1 && menuOffset + menuIndex < nengineModeList - 1) |
490 menuIndex++; | |
491 else | |
492 if (menuOffset + menuIndex < nengineModeList - 1) | |
493 menuOffset++; | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
494 break; |
632
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
495 |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
496 case SDLK_LEFT: |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
497 menuFullScreen = FALSE; |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
498 break; |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
499 |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
500 case SDLK_RIGHT: |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
501 menuFullScreen = TRUE; |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
502 break; |
78cef1000a18
Make left/right arrow keys to set windowed/fullscreen.
Matti Hamalainen <ccr@tnsp.org>
parents:
631
diff
changeset
|
503 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
504 case SDLK_SPACE: |
623 | 505 menuFullScreen = !menuFullScreen; |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
506 break; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
507 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
508 default: |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
509 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
510 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
511 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
512 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
513 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
514 case SDL_QUIT: |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
515 menuState = -1; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
516 break; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
517 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
518 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
519 // Draw frame |
608 | 520 engine.frameTime = SDL_GetTicks(); |
850 | 521 if (SDL_MUSTLOCK(engine.screen) && SDL_LockSurface(engine.screen) != 0) |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
522 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
523 dmError(DMERR_INTERNAL, "Can't lock surface.\n"); |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
524 goto out; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
525 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
526 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
527 // Render the menu |
614
eed8d6abd89b
Pre-convert/scale menu background and use direct blitting.
Matti Hamalainen <ccr@tnsp.org>
parents:
608
diff
changeset
|
528 dmDirectBlitSurface(menuBgImage, engine.screen); |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
529 |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
530 // XXX/TODO: Some hardcoded bits here ... |
608 | 531 float t = engineGetTimeDT(&engine); |
620 | 532 int index, entry; |
615 | 533 |
620 | 534 for (index = 0, entry = menuOffset; entry < nengineModeList && index < menuHeight; index++, entry++) |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
535 { |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
536 DMModeEntry *mode = &engineModeList[entry]; |
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
537 |
620 | 538 if (entry == menuOffset + menuIndex) |
539 { | |
540 dmScaledBlitSurface32to32TransparentGA(menuBarImage, | |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
541 vsX(setupMenuPos) + vsX(setupMenuBarOffs), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
542 vsY(setupMenuPos) + vsY(setupMenuBarOffs) + (index * menuEntryHeight), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
543 vsX(setupMenuDim) + vsX(setupMenuBarDimAdj), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
544 menuEntryHeight + vsY(setupMenuBarDimAdj), |
620 | 545 engine.screen, |
546 200 + sin(t * 10.0) * 50); | |
547 } | |
548 | |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
549 snprintf(menuStr, sizeof(menuStr), |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
550 "%4d X %-4d - %d:%d", |
620 | 551 mode->w, mode->h, |
552 mode->aspect / 1000, | |
553 mode->aspect % 1000); | |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
554 |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
555 DMFloat posX = setupMenuCenter ? |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
556 2.0f + (vsX(setupMenuDim) - menuFont->width * strlen(menuStr)) / 2.0f : |
623 | 557 2.0f; |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
558 |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
559 dmDrawBMTextConst( |
635
7092cd50bc08
Add condensed text configuration option to setup screen config.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
560 engine.screen, menuFont, |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
561 setupTextCondensed, DMD_TRANSPARENT, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
562 vsX(setupMenuPos) + posX, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
563 vsY(setupMenuPos) + (index * menuEntryHeight), |
597
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
564 menuStr); |
8a9361179a1a
More work on the video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
595
diff
changeset
|
565 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
566 |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
567 dmDrawBMTextConst( |
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
568 engine.screen, menuFont, |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
569 setupTextCondensed, DMD_TRANSPARENT, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
570 vsX(setupText2Pos), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
571 vsY(setupText2Pos), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
572 setupTextEnterToStart); |
847
cf142447dd63
Add "enter to start" text for the setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
846
diff
changeset
|
573 |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
574 snprintf(menuStr, sizeof(menuStr), |
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
575 "%s%s", |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
576 setupTextPrefix, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
577 menuFullScreen ? setupTextFullscreen : setupTextWindowed); |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
578 |
619
6c23042c546f
Aaaand some more work on mode selector.
Matti Hamalainen <ccr@tnsp.org>
parents:
618
diff
changeset
|
579 dmDrawBMTextConst( |
635
7092cd50bc08
Add condensed text configuration option to setup screen config.
Matti Hamalainen <ccr@tnsp.org>
parents:
632
diff
changeset
|
580 engine.screen, menuFont, |
1321
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
581 setupTextCondensed, DMD_TRANSPARENT, |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
582 vsX(setupText1Pos), |
6732a5ca1fae
Cleanup the dmsimple engine setup system a bit, move bits out of DMEngine
Matti Hamalainen <ccr@tnsp.org>
parents:
1273
diff
changeset
|
583 vsY(setupText1Pos), |
756
4dda14ff8e1a
Add some configurable texts to setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
755
diff
changeset
|
584 menuStr); |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
585 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
586 // Flip screen |
850 | 587 if (SDL_MUSTLOCK(engine.screen)) |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
588 SDL_UnlockSurface(engine.screen); |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
589 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
590 SDL_Flip(engine.screen); |
616
ed4536641796
A bit slower screen update rate.
Matti Hamalainen <ccr@tnsp.org>
parents:
615
diff
changeset
|
591 SDL_Delay(25); |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
592 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
593 |
621 | 594 // Okay, we accepted the selection |
595 if (menuState == 1) | |
596 { | |
597 DMModeEntry *mode = &engineModeList[menuOffset + menuIndex]; | |
753
8dd6d512cbb2
Add variable for detecting if we are in "native" video resolution.
Matti Hamalainen <ccr@tnsp.org>
parents:
733
diff
changeset
|
598 engine.optVidNative = |
8dd6d512cbb2
Add variable for detecting if we are in "native" video resolution.
Matti Hamalainen <ccr@tnsp.org>
parents:
733
diff
changeset
|
599 mode->w == engine.optVidWidth && |
8dd6d512cbb2
Add variable for detecting if we are in "native" video resolution.
Matti Hamalainen <ccr@tnsp.org>
parents:
733
diff
changeset
|
600 mode->h == engine.optVidHeight; |
8dd6d512cbb2
Add variable for detecting if we are in "native" video resolution.
Matti Hamalainen <ccr@tnsp.org>
parents:
733
diff
changeset
|
601 |
621 | 602 engine.optVidWidth = mode->w; |
603 engine.optVidHeight = mode->h; | |
604 engine.optVidAspect = mode->aspect; | |
623 | 605 if (menuFullScreen) |
621 | 606 engine.optVFlags |= SDL_FULLSCREEN; |
753
8dd6d512cbb2
Add variable for detecting if we are in "native" video resolution.
Matti Hamalainen <ccr@tnsp.org>
parents:
733
diff
changeset
|
607 |
621 | 608 } |
609 | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
610 out: |
608 | 611 SDL_FreeSurface(menuBgImage); |
612 SDL_FreeSurface(menuBarImage); | |
613 dmFreeBitmapFont(menuFont); | |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
614 |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
615 return menuState; |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
616 } |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
617 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
618 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
619 int main(int argc, char *argv[]) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
620 { |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
621 int err; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
622 BOOL initSDL = FALSE; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
623 |
1167 | 624 dmMemset(&engine, 0, sizeof(engine)); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
625 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
626 // Pre-initialization |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
627 if ((err = demoPreInit(&engine)) != DMERR_OK) |
1054 | 628 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
629 |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
630 if (!dmArgsProcess(argc, argv, optList, optListN, |
861
15b413845e24
Oops, few dmargs* API changes related fixes were missing.
Matti Hamalainen <ccr@tnsp.org>
parents:
850
diff
changeset
|
631 argHandleOpt, NULL, OPTH_BAILOUT)) |
121
16fc6e6cf3b5
Move option handling to the simple demo engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
113
diff
changeset
|
632 return DMERR_INIT_FAIL; |
123
6f7356f3b91c
Add engine startup messages showing prod name and "TNSP simple demoengine blurb".
Matti Hamalainen <ccr@tnsp.org>
parents:
122
diff
changeset
|
633 |
6f7356f3b91c
Add engine startup messages showing prod name and "TNSP simple demoengine blurb".
Matti Hamalainen <ccr@tnsp.org>
parents:
122
diff
changeset
|
634 dmPrint(0, |
6f7356f3b91c
Add engine startup messages showing prod name and "TNSP simple demoengine blurb".
Matti Hamalainen <ccr@tnsp.org>
parents:
122
diff
changeset
|
635 "%s\n" |
631
25656351f5f9
Remove the note about TNSP simple demoengine.
Matti Hamalainen <ccr@tnsp.org>
parents:
623
diff
changeset
|
636 "%s\n", |
123
6f7356f3b91c
Add engine startup messages showing prod name and "TNSP simple demoengine blurb".
Matti Hamalainen <ccr@tnsp.org>
parents:
122
diff
changeset
|
637 dmProgDesc, dmProgAuthor); |
125
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
638 |
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
639 dmPrint(0, |
1057 | 640 "Using libSDL" |
641 #if defined(DM_USE_PACKFS) && defined(DM_USE_ZLIB) | |
642 ", zlib" | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
643 #endif |
125
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
644 #ifdef DM_USE_TREMOR |
1057 | 645 ", Tremor Vorbis codec" |
125
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
646 #endif |
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
647 " and modified stb_image.\n" |
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
648 "See README.txt for more information.\n"); |
5102ec9e9bce
Add a blurb about used features/3rd party code (zlib, Tremor, SDL).
Matti Hamalainen <ccr@tnsp.org>
parents:
123
diff
changeset
|
649 |
967
b387481e511e
Remember to initialize dmzlib in the engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
962
diff
changeset
|
650 // Initialize dmZlib |
1054 | 651 if ((err = dmZLibInit()) != DMERR_OK) |
652 { | |
653 dmErrorDBGMsg( | |
654 "Failed to initialize dmzlib: %d, %s.\n", | |
655 err, dmErrorStr(err)); | |
656 goto out; | |
657 } | |
967
b387481e511e
Remember to initialize dmzlib in the engine.
Matti Hamalainen <ccr@tnsp.org>
parents:
962
diff
changeset
|
658 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
659 // Initialize resource subsystem |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
660 dmPrint(1, "Initializing resources subsystem.\n"); |
721
bb14d7907eb2
Rename many pack & resource handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
661 if ((err = dmResourcesInit(&engine.resources, engine.optPackFilename, |
600 | 662 engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK) |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
663 { |
1119
007a9446256c
Enable some error messages also in not-debug-build.
Matti Hamalainen <ccr@tnsp.org>
parents:
1102
diff
changeset
|
664 dmErrorMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
665 "Could not initialize resource manager, #%d: %s.\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
666 err, dmErrorStr(err)); |
1054 | 667 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
668 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
669 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
670 // Initialize SDL components |
122
5ba672ebe014
Add some verbose engine startup messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
671 dmPrint(1, "Initializing libSDL.\n"); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
672 if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER) != 0) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
673 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
674 dmError(DMERR_INIT_FAIL, |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
675 "Could not initialize SDL: %s\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
676 SDL_GetError()); |
1054 | 677 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
678 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
679 initSDL = TRUE; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
680 |
868
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
681 // Set start time |
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
682 engine.startTimeAudio = -1; |
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
683 engine.startTime = -1; |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
684 |
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
685 // Present video mode selector |
593 | 686 if (engine.optVidAspect <= 0) |
687 engine.optVidAspect = engineGetVideoAspect(engine.optVidWidth, engine.optVidHeight); | |
688 | |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
689 if (engine.optVidSetup) |
593 | 690 { |
691 if ((err = engineVideoSetup()) <= 0) | |
1054 | 692 goto out; |
593 | 693 } |
578
cf5d44b36851
Add some initial code for video setup screen.
Matti Hamalainen <ccr@tnsp.org>
parents:
574
diff
changeset
|
694 |
122
5ba672ebe014
Add some verbose engine startup messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
695 // Initialize audio parts |
126
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
696 if (engine.optAfmt.freq == 0 && engine.optAfmt.channels == 0) |
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
697 { |
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
698 engine.optAfmt.freq = 44100; |
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
699 engine.optAfmt.format = AUDIO_S16SYS; |
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
700 engine.optAfmt.channels = 2; |
97488948215c
Allow setting audio format settings.
Matti Hamalainen <ccr@tnsp.org>
parents:
125
diff
changeset
|
701 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
702 |
640
55743025d628
Change audio default setup.
Matti Hamalainen <ccr@tnsp.org>
parents:
635
diff
changeset
|
703 if (engine.optAfmt.samples == 0) |
787 | 704 engine.optAfmt.samples = engine.optAfmt.freq / 50; |
105
d5d27f262227
Beging merging of dmsimple2-fork into the main "engine".
Matti Hamalainen <ccr@tnsp.org>
parents:
94
diff
changeset
|
705 |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
706 switch (engine.optAudioSetup) |
105
d5d27f262227
Beging merging of dmsimple2-fork into the main "engine".
Matti Hamalainen <ccr@tnsp.org>
parents:
94
diff
changeset
|
707 { |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
708 case DM_ASETUP_JSS: |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
709 #ifdef DM_USE_JSS |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
710 jssInit(); |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
711 |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
712 switch (engine.optAfmt.format) |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
713 { |
754 | 714 case AUDIO_S16SYS: engine.jssFormat = JSS_AUDIO_S16; break; |
715 case AUDIO_U16SYS: engine.jssFormat = JSS_AUDIO_U16; break; | |
716 case AUDIO_S8: engine.jssFormat = JSS_AUDIO_S8; break; | |
717 case AUDIO_U8: engine.jssFormat = JSS_AUDIO_U8; break; | |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
718 } |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
719 |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
720 dmPrint(1, "Initializing miniJSS mixer with fmt=%d, chn=%d, freq=%d\n", |
754 | 721 engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
722 |
754 | 723 if ((engine.jssDev = jvmInit(engine.jssFormat, engine.optAfmt.channels, engine.optAfmt.freq, JMIX_AUTO)) == NULL) |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
724 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
725 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
726 "jvmInit() returned NULL, voi perkele.\n"); |
1054 | 727 goto out; |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
728 } |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
729 |
754 | 730 if ((engine.jssPlr = jmpInit(engine.jssDev)) == NULL) |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
731 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
732 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
733 "jmpInit() returned NULL\n"); |
1054 | 734 goto out; |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
735 } |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
736 #else |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
737 dmErrorDBGMsg("miniJSS support not included.\n"); |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
738 #endif |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
739 break; |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
740 |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
741 case DM_ASETUP_TREMOR: |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
742 #ifndef DM_USE_TREMOR |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
743 dmErrorDBGMsg("Tremor support not included.\n"); |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
744 #endif |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
745 break; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
746 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
747 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
748 // Initialize SDL audio |
787 | 749 dmPrint(1, "Trying to init SDL audio with: fmt=%d, chn=%d, freq=%d, samples=%d\n", |
750 engine.optAfmt.format, engine.optAfmt.channels, | |
751 engine.optAfmt.freq, engine.optAfmt.samples); | |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
752 |
846 | 753 if ((err = engineInitAudioParts(&engine)) != DMERR_OK) |
786
bc95f8a6d89c
Add audio sample size information into the engine structure.
Matti Hamalainen <ccr@tnsp.org>
parents:
785
diff
changeset
|
754 { |
1273
132706e3b94b
Improve error handling and reporting slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
1263
diff
changeset
|
755 dmErrorMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
756 "engineInitAudioParts() failed: #%d: %s\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
757 err, dmErrorStr(err)); |
1054 | 758 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
759 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
760 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
761 // Initialize SDL video |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
762 if (engine.demoInitPreVideo != NULL && |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
763 (err = engine.demoInitPreVideo(&engine)) != DMERR_OK) |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
764 { |
1273
132706e3b94b
Improve error handling and reporting slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
1263
diff
changeset
|
765 dmErrorMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
766 "demoInitPreVideo() failed, #%d: %s\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
767 err, dmErrorStr(err)); |
1054 | 768 goto out; |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
769 } |
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
770 |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
771 if (!engineInitializeVideo()) |
1054 | 772 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
773 |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
774 if (engine.demoInitPostVideo != NULL && |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
775 (err = engine.demoInitPostVideo(&engine)) != DMERR_OK) |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
776 { |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
777 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
778 "demoInitPostVideo() failed, #%d: %s\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
779 err, dmErrorStr(err)); |
1054 | 780 goto out; |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
781 } |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
782 |
593 | 783 // Hide cursor |
784 SDL_ShowCursor(SDL_DISABLE); | |
785 | |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
786 // Load resources |
122
5ba672ebe014
Add some verbose engine startup messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
787 dmPrint(1, "Loading resources, please wait...\n"); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
788 if ((err = engineLoadResources()) != DMERR_OK) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
789 { |
1273
132706e3b94b
Improve error handling and reporting slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
1263
diff
changeset
|
790 dmErrorMsg( |
962 | 791 "Error loading resources, #%d: %s.\n", |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
792 err, dmErrorStr(err)); |
1054 | 793 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
794 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
795 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
796 // Final initializations |
1122 | 797 dmPrint(1, "Initializing demo...\n"); |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
798 if ((err = engine.demoInit(&engine)) != DMERR_OK) |
354 | 799 { |
1273
132706e3b94b
Improve error handling and reporting slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
1263
diff
changeset
|
800 dmErrorMsg( |
962 | 801 "Failure in demoInit(), #%d: %s\n", |
354 | 802 err, dmErrorStr(err)); |
1054 | 803 goto out; |
354 | 804 } |
805 | |
806 // Initialize effects | |
369 | 807 if ((err = engineInitializeEffects(&engine)) != DMERR_OK) |
354 | 808 { |
1273
132706e3b94b
Improve error handling and reporting slightly.
Matti Hamalainen <ccr@tnsp.org>
parents:
1263
diff
changeset
|
809 dmErrorMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
810 "Effects initialization failed, #%d: %s\n", |
354 | 811 err, dmErrorStr(err)); |
1054 | 812 goto out; |
354 | 813 } |
814 | |
815 // Use a timeline, if set | |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
816 #ifdef DM_USE_TIMELINE |
354 | 817 if (engine.timeline != NULL) |
818 { | |
819 if ((err = dmLoadTimeline(engine.timeline, &engine.tl)) != DMERR_OK) | |
820 { | |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
821 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
822 "Error loading timeline, #%d: %s\n", |
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
823 err, dmErrorStr(err)); |
1054 | 824 goto out; |
354 | 825 } |
826 | |
827 if ((err = dmPrepareTimeline(engine.tl, engine.ptl)) != DMERR_OK) | |
828 { | |
1049
771e03bf9fcd
Make more error message fall under DM_DEBUG.
Matti Hamalainen <ccr@tnsp.org>
parents:
967
diff
changeset
|
829 dmErrorDBGMsg( |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
830 "Error creating prepared timeline, #%d: %s\n", |
354 | 831 err, dmErrorStr(err)); |
1054 | 832 goto out; |
354 | 833 } |
834 } | |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
835 #endif |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
836 |
122
5ba672ebe014
Add some verbose engine startup messages.
Matti Hamalainen <ccr@tnsp.org>
parents:
121
diff
changeset
|
837 dmPrint(1, "Starting up.\n"); |
278 | 838 |
868
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
839 engine.startTime = SDL_GetTicks(); |
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
840 |
278 | 841 SDL_LockAudio(); |
1263
4e9deb14e67f
Fix audio sync with nosound.
Matti Hamalainen <ccr@tnsp.org>
parents:
1167
diff
changeset
|
842 enginePauseAudio(&engine, 0); |
278 | 843 SDL_UnlockAudio(); |
844 | |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
845 while (!engine.exitFlag) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
846 { |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
847 while (SDL_PollEvent(&engine.event)) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
848 switch (engine.event.type) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
849 { |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
850 case SDL_KEYDOWN: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
851 switch (engine.event.key.keysym.sym) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
852 { |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
853 case SDLK_ESCAPE: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
854 engine.exitFlag = TRUE; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
855 break; |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
856 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
857 case SDLK_SPACE: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
858 engine.pauseFlag = !engine.pauseFlag; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
859 break; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
860 |
336
13dba73cf28e
Add 'F' key to fullscreen toggling, in addition to alt+enter.
Matti Hamalainen <ccr@tnsp.org>
parents:
335
diff
changeset
|
861 case SDLK_f: |
13dba73cf28e
Add 'F' key to fullscreen toggling, in addition to alt+enter.
Matti Hamalainen <ccr@tnsp.org>
parents:
335
diff
changeset
|
862 engine.optVFlags ^= SDL_FULLSCREEN; |
13dba73cf28e
Add 'F' key to fullscreen toggling, in addition to alt+enter.
Matti Hamalainen <ccr@tnsp.org>
parents:
335
diff
changeset
|
863 if (!engineInitializeVideo()) |
1054 | 864 goto out; |
336
13dba73cf28e
Add 'F' key to fullscreen toggling, in addition to alt+enter.
Matti Hamalainen <ccr@tnsp.org>
parents:
335
diff
changeset
|
865 break; |
13dba73cf28e
Add 'F' key to fullscreen toggling, in addition to alt+enter.
Matti Hamalainen <ccr@tnsp.org>
parents:
335
diff
changeset
|
866 |
109
3de6301dcfe1
Implement fullscrene toggling via alt+enter
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
867 case SDLK_RETURN: |
3de6301dcfe1
Implement fullscrene toggling via alt+enter
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
868 if (engine.event.key.keysym.mod & KMOD_ALT) |
3de6301dcfe1
Implement fullscrene toggling via alt+enter
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
869 { |
332
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
870 engine.optVFlags ^= SDL_FULLSCREEN; |
d4802335cbbc
Clean up video (re)initialization.
Matti Hamalainen <ccr@tnsp.org>
parents:
316
diff
changeset
|
871 if (!engineInitializeVideo()) |
1054 | 872 goto out; |
109
3de6301dcfe1
Implement fullscrene toggling via alt+enter
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
873 } |
3de6301dcfe1
Implement fullscrene toggling via alt+enter
Matti Hamalainen <ccr@tnsp.org>
parents:
105
diff
changeset
|
874 break; |
93
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
875 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
876 default: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
877 break; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
878 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
879 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
880 break; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
881 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
882 case SDL_VIDEOEXPOSE: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
883 break; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
884 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
885 case SDL_QUIT: |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
886 engine.exitFlag = TRUE; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
887 break; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
888 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
889 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
890 // Draw frame |
361 | 891 engine.frameTime = SDL_GetTicks(); |
93
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
892 if (engine.pauseFlag != engine.paused) |
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
893 { |
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
894 engine.paused = engine.pauseFlag; |
367 | 895 engine.pauseTime = engineGetTick(&engine); |
93
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
896 } |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
897 |
93
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
898 if (engine.paused) |
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
899 { |
361 | 900 engine.startTime = engine.frameTime - engine.pauseTime; |
93
15fdd5573344
Add simple (and buggy / not really working) debug mode.
Matti Hamalainen <ccr@tnsp.org>
parents:
42
diff
changeset
|
901 } |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
902 |
850 | 903 if (SDL_MUSTLOCK(engine.screen) && SDL_LockSurface(engine.screen) != 0) |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
904 { |
958
985225a93aeb
Add error code parameter to dmError() and dmErrorVA().
Matti Hamalainen <ccr@tnsp.org>
parents:
868
diff
changeset
|
905 dmError(DMERR_INTERNAL, "Can't lock surface.\n"); |
1054 | 906 goto out; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
907 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
908 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
909 // Call main tick |
345
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
910 if (engine.demoRender != NULL) |
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
911 { |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
912 if ((err = engine.demoRender(&engine)) != DMERR_OK) |
1054 | 913 goto out; |
345
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
914 } |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
915 #ifdef DM_USE_TIMELINE |
345
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
916 else |
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
917 { |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
918 if ((err = dmExecuteTimeline(engine.ptl, engine.screen, engineGetTick(&engine))) != DMERR_OK) |
1054 | 919 goto out; |
345
cac13f180169
Work towards timeline support.
Matti Hamalainen <ccr@tnsp.org>
parents:
342
diff
changeset
|
920 } |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
921 #endif |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
922 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
923 // Flip screen |
850 | 924 if (SDL_MUSTLOCK(engine.screen)) |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
925 SDL_UnlockSurface(engine.screen); |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
926 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
927 SDL_Flip(engine.screen); |
105
d5d27f262227
Beging merging of dmsimple2-fork into the main "engine".
Matti Hamalainen <ccr@tnsp.org>
parents:
94
diff
changeset
|
928 SDL_Delay(engine.paused ? 100 : 20); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
929 |
361 | 930 engine.frameCount++; |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
931 } |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
932 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
933 // Print benchmark results |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
934 engine.endTime = SDL_GetTicks(); |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
935 dmPrint(1, "%d frames in %d ms, fps = %1.3f\n", |
361 | 936 engine.frameCount, engine.endTime - engine.startTime, |
937 (float) (engine.frameCount * 1000.0f) / (float) (engine.endTime - engine.startTime)); | |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
938 |
868
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
939 dmPrint(1, "startTime=%d, startTimeAudio=%d, offsetTime=%d\n", |
2c6b092328be
Possibly improve audio synchronization.
Matti Hamalainen <ccr@tnsp.org>
parents:
863
diff
changeset
|
940 engine.startTime, engine.startTimeAudio, engine.offsetTime); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
941 |
1054 | 942 out: |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
943 |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
944 dmPrint(1, "Shutting down.\n"); |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
945 SDL_ShowCursor(SDL_ENABLE); |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
946 |
278 | 947 SDL_LockAudio(); |
1263
4e9deb14e67f
Fix audio sync with nosound.
Matti Hamalainen <ccr@tnsp.org>
parents:
1167
diff
changeset
|
948 enginePauseAudio(&engine, 1); |
105
d5d27f262227
Beging merging of dmsimple2-fork into the main "engine".
Matti Hamalainen <ccr@tnsp.org>
parents:
94
diff
changeset
|
949 #ifdef DM_USE_JSS |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
950 if (engine.optAudioSetup == DM_ASETUP_JSS) |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
951 { |
769
b87c7fc646f9
Fix two 10L: forgot to rename these structure members here.
Matti Hamalainen <ccr@tnsp.org>
parents:
756
diff
changeset
|
952 jmpClose(engine.jssPlr); |
b87c7fc646f9
Fix two 10L: forgot to rename these structure members here.
Matti Hamalainen <ccr@tnsp.org>
parents:
756
diff
changeset
|
953 jvmClose(engine.jssDev); |
641
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
954 jssClose(); |
c3852e49a610
Change how audio configuration works.
Matti Hamalainen <ccr@tnsp.org>
parents:
640
diff
changeset
|
955 } |
278 | 956 #endif |
781
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
957 |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
958 if (engine.audioSimThread != NULL) |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
959 { |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
960 dmMutexLock(engine.audioStreamMutex); |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
961 engine.audioSimDone = TRUE; |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
962 dmMutexUnlock(engine.audioStreamMutex); |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
963 SDL_WaitThread(engine.audioSimThread, NULL); |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
964 } |
e15e0469499a
Add initial code for simulating audio playback while in no-sound situation.
Matti Hamalainen <ccr@tnsp.org>
parents:
769
diff
changeset
|
965 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
966 SDL_UnlockAudio(); |
1102
e06abfde6c39
Cosmetics pass: Remove excess whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
1079
diff
changeset
|
967 |
755
614df17de975
Add mutex locking to audio stream stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
754
diff
changeset
|
968 if (engine.audioStreamMutex != NULL) |
614df17de975
Add mutex locking to audio stream stuff.
Matti Hamalainen <ccr@tnsp.org>
parents:
754
diff
changeset
|
969 dmDestroyMutex(engine.audioStreamMutex); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
970 |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
971 #ifdef DM_USE_TIMELINE |
354 | 972 dmFreeTimeline(engine.tl); |
973 dmFreePreparedTimelineData(engine.ptl); | |
573
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
974 #endif |
14640d0688d3
Make timeline stuff optional.
Matti Hamalainen <ccr@tnsp.org>
parents:
571
diff
changeset
|
975 |
369 | 976 engineShutdownEffects(&engine); |
721
bb14d7907eb2
Rename many pack & resource handling functions.
Matti Hamalainen <ccr@tnsp.org>
parents:
642
diff
changeset
|
977 dmResourcesClose(engine.resources); |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
978 |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
979 if (engine.demoShutdown != NULL) |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
980 engine.demoShutdown(&engine); |
94
4bbfc0274b29
Change some function names, etc.
Matti Hamalainen <ccr@tnsp.org>
parents:
93
diff
changeset
|
981 |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
982 if (initSDL) |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
983 SDL_Quit(); |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
984 |
127
ab4086db7dad
Various improvements in modularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
126
diff
changeset
|
985 if (engine.demoQuit != NULL) |
366
38e10b5f4e09
Work towards base engine re-entrancy.
Matti Hamalainen <ccr@tnsp.org>
parents:
361
diff
changeset
|
986 engine.demoQuit(&engine); |
1054 | 987 |
988 dmZLibClose(); | |
989 | |
32
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
990 return 0; |
d1a6833a5d67
Added a simple demo engine core.
Matti Hamalainen <ccr@tnsp.org>
parents:
diff
changeset
|
991 } |