Glenn Maynard
2b00a2f62a
simplify
2006-01-15 08:41:17 +00:00
Glenn Maynard
0fcdffd9b4
reorder
2006-01-15 08:37:34 +00:00
Glenn Maynard
eb0789f057
simplify
2006-01-15 08:35:08 +00:00
Glenn Maynard
51079573e2
reset m_sNextScreen and m_sPrevScreen in BeginScreen()
2006-01-15 08:28:00 +00:00
Glenn Maynard
9ca202d311
remove transition
2006-01-15 08:21:03 +00:00
Glenn Maynard
0ff2505831
PlayerNumber(0) -> PLAYER_1
2006-01-15 08:15:27 +00:00
Glenn Maynard
cfedf33602
remove empty overload
2006-01-15 08:13:24 +00:00
Glenn Maynard
e341ce46bb
remove unused
2006-01-15 08:12:27 +00:00
Glenn Maynard
49bdcb8936
unused
2006-01-15 08:10:26 +00:00
Glenn Maynard
6467fa0bc4
simplify, eliminate GetAndClearScreen
2006-01-15 08:09:03 +00:00
Glenn Maynard
cb4739ff31
Use ApplyCommitsScreens. This is simpler, and eliminates one of the
...
few remaining uses of "NEXT_SCREEN" (deviations from the Screen path)
and nonstandard "SM_GoToNextScreen".
2006-01-15 08:04:40 +00:00
Glenn Maynard
55efe79054
Most of the time we use a GameCommand to store state, we don't want
...
Apply() itself to load the screen; we want to stuff it in m_sNextScreen
and let the normal screen loading code path do it. That's why we have
GetAndClearScreen.
However, GetAndClearScreen is a non-const, and applying a GameCommand
should be a const operation. It doesn't get along well with screen
reuse; once you've applied it, you've destroyed the GameCommand.
Instead, hold a flag indicating whether or not to apply screens, and
set this true on load when we handle it manually. We should probably
*always* do this, and never load a screen within GameCommand itself, so
this may go away soon (always on).
2006-01-15 08:00:37 +00:00
Glenn Maynard
1d186c481d
const fix
2006-01-15 07:12:05 +00:00
Glenn Maynard
6be6053227
const fix
2006-01-15 07:10:05 +00:00
Glenn Maynard
599c024df2
remove unused
2006-01-15 07:03:04 +00:00
Glenn Maynard
b744d72b74
style
2006-01-15 06:58:18 +00:00
Glenn Maynard
2025761281
cleanup
2006-01-15 04:12:50 +00:00
Glenn Maynard
affaf07d35
rename ConfigureGraphicsWindow -> CreateGraphicsWindow
2006-01-15 01:43:04 +00:00
Glenn Maynard
7adadb4d2c
cleanup
2006-01-15 01:14:01 +00:00
Glenn Maynard
079ee70c90
cleanup
2006-01-15 01:12:58 +00:00
Glenn Maynard
692cee7ddc
merge old CreateGraphicsWindow
2006-01-15 01:10:45 +00:00
Glenn Maynard
61654be8de
remove remove SetVideoModeParams
2006-01-15 01:08:24 +00:00
Glenn Maynard
16c7813949
remove SetVideoModeParams call
2006-01-15 01:07:32 +00:00
Glenn Maynard
2de99a1d59
merge SetVideoModeParams into ConfigureGraphicsWindow (the lifetime of this data has always been too confusing)
2006-01-15 01:05:43 +00:00
Glenn Maynard
669339a57f
don't export CreateGraphicsWindow
2006-01-15 01:01:53 +00:00
Glenn Maynard
50b0f360f4
CreateGraphicsWindow is done by ConfigureGraphicsWindow
2006-01-15 00:59:32 +00:00
Glenn Maynard
76dca9fb6f
add bForceRecreateWindow
2006-01-15 00:55:27 +00:00
Glenn Maynard
989fe982b7
call CreateGraphicsWindow when needed
2006-01-15 00:51:45 +00:00
Glenn Maynard
58a5e76ccd
don't expose
2006-01-15 00:44:37 +00:00
Glenn Maynard
d52b52386b
remove RecreateGraphicsWindow
2006-01-15 00:39:20 +00:00
Glenn Maynard
7c2f1fc48b
RecreateGraphicsWindow -> CreateGraphicsWindow
2006-01-15 00:38:43 +00:00
Glenn Maynard
72036009b3
merge CreateGraphicsWindow and RecreateGraphicsWindow
2006-01-15 00:37:03 +00:00
Glenn Maynard
5e2a79e1d3
nudge CreateGraphicsWindow and RecreateGraphicsWindow together
2006-01-15 00:34:21 +00:00
Glenn Maynard
60e0bccef0
nudge CreateGraphicsWindow and RecreateGraphicsWindow together
2006-01-15 00:29:34 +00:00
Glenn Maynard
c78cbd62f4
Simplify: harmless to call ChangeDisplaySettings(NULL,0) when going
...
windowed to windowed, too. (This g_CurrentParams use is confusing;
trying to reduce it ...)
2006-01-15 00:14:25 +00:00
Glenn Maynard
1fdb63a26d
clarify
2006-01-15 00:12:52 +00:00
Glenn Maynard
4a09761d19
fix crash
2006-01-15 00:05:22 +00:00
Glenn Maynard
2c6e28f46d
fix stack imbalances
2006-01-15 00:04:51 +00:00
Glenn Maynard
a1592e71e7
VideoModeParams has a bunch of settings. It's confusing to
...
pass the whole thing around, since it's not clear what data
is actually used. For simple functions, just pass the needed
data.
2006-01-14 23:44:31 +00:00
Glenn Maynard
ebb91dc6e1
cleanup
2006-01-14 23:22:34 +00:00
Glenn Maynard
8bdd24cb8a
blank Exit title in metrics, not with a special case
2006-01-14 19:01:23 +00:00
Glenn Maynard
b4e0f5f81a
inifile is writing this stuff alphabetically
2006-01-14 18:59:19 +00:00
Glenn Maynard
8eff6bb0c2
clarify
2006-01-14 18:52:54 +00:00
Glenn Maynard
7530be4e23
make these conditionals look the same
2006-01-14 18:52:00 +00:00
Glenn Maynard
897c74a40e
Remove unused "ShowMore", "HideMore".
2006-01-14 18:14:46 +00:00
Glenn Maynard
b50e09f5d6
simplify
2006-01-14 18:11:12 +00:00
Glenn Maynard
445d92410c
simplify
2006-01-14 18:10:41 +00:00
Glenn Maynard
029f9343f6
revert
2006-01-14 18:02:54 +00:00
Glenn Maynard
9eb0fcb944
style
2006-01-14 09:15:09 +00:00
Glenn Maynard
0f33586397
We always handle the case where m_Underline[pn] is empty, since SHOW_UNDERLINES may be false. So, don't add the underline, hide it and then special case not un-hiding it; just don't add it.
2006-01-14 09:12:55 +00:00
Glenn Maynard
afaf56c160
cleanup
2006-01-14 09:09:49 +00:00
Glenn Maynard
3beae6e2bc
simplify
2006-01-14 08:56:22 +00:00
Glenn Maynard
2d00aaf5d5
update comment
2006-01-14 08:55:27 +00:00
Glenn Maynard
b4691c560f
simplify: "more" makes as much sense when the last entry isn't "exit"
2006-01-14 08:03:46 +00:00
Glenn Maynard
04ec901671
style
2006-01-14 08:01:34 +00:00
Glenn Maynard
201c4f42a8
generalize special case
2006-01-14 08:00:09 +00:00
Glenn Maynard
d5a47f9af1
unneeded special case
2006-01-14 07:56:04 +00:00
Glenn Maynard
8374d2193b
unneeded special case (m_OptionIcons[p] == NULL case below handles this too)
2006-01-14 07:53:39 +00:00
Glenn Maynard
f4a634034c
lua stack check
2006-01-14 06:53:09 +00:00
Glenn Maynard
d8ae5df6ef
fix leak
2006-01-14 06:46:15 +00:00
Glenn Maynard
87b25c0752
fix crash
2006-01-14 06:02:59 +00:00
Glenn Maynard
2891e4d066
update
...
blank "exit" explanation
2006-01-14 05:58:25 +00:00
Glenn Maynard
4f4654529f
add ScreenMetric, ScreenString
2006-01-14 05:57:14 +00:00
Glenn Maynard
fac7b375c2
Add ExitItem and ExitTitle exit rows. This implements "exit" with
...
regular rows. This allows us to move away from the tweaky, special
exit row.
2006-01-14 05:49:05 +00:00
Glenn Maynard
3a63f5b7ef
as well as during load, set LoadingScreen during BeginScreen.
...
Scripts can already use GetTopScreen to get this. However, that function
also returns data that may not be what's wanted. For example, commands
can be run on screens that aren't on top (eg. via broadcasts). So, using
GetTopScreen as a fallback for LoadingScreen may cause latent bugs;
screens should behave properly even when they're not on top, even if
they're using queued broadcasts to kick off animations, etc.
2006-01-14 05:32:54 +00:00
Glenn Maynard
6344476389
add ActorUtil::ActorParam helper
2006-01-14 05:27:29 +00:00
Glenn Maynard
776ff285cf
allow empty translatable strings
2006-01-14 04:31:56 +00:00
Glenn Maynard
7c25138029
typo
2006-01-14 04:21:54 +00:00
Glenn Maynard
9ca7586632
add SetPreferenceToDefault
2006-01-14 04:10:01 +00:00
Glenn Maynard
d4d16623cf
cleanup
2006-01-14 04:02:13 +00:00
Glenn Maynard
cdf951e589
Instead of loading Defaults.ini underneith Preferences.ini, change the
...
actual IPreference defaults according to Defaults.ini. This way, we can
access default values immediately, without having to load and parse a
file. Since this simply changes the value in the preference, this doesn't
use any more memory.
2006-01-14 03:56:59 +00:00
Glenn Maynard
115e901d82
ReadFrom and WriteTo are never overloaded; they're implemented
...
via ToString and FromString. Remove virtual for clarity.
2006-01-14 03:33:48 +00:00
Glenn Maynard
92c93e2fdf
HelpDisplay:settips no longer takes "::" as newline. Use "\n".
2006-01-14 03:12:45 +00:00
Glenn Maynard
f0dc808168
Remove LoadHelpText overload. Call settips() yourself via message
...
commands instead.
2006-01-14 02:35:08 +00:00
Glenn Maynard
e05770c65b
fix "join"
2006-01-14 02:25:46 +00:00
Glenn Maynard
973fabdac6
smpackage fix
2006-01-14 00:56:24 +00:00
Glenn Maynard
1d488f223d
typo
2006-01-14 00:40:55 +00:00
Glenn Maynard
fecda0367f
cleanup
2006-01-13 23:21:18 +00:00
Glenn Maynard
97bd1669d4
Don't need to special case RowType_Exit here; the bullet is hidden,
...
and this will be a no-op.
2006-01-13 23:17:15 +00:00
Glenn Maynard
d276d5d001
cleanup
2006-01-13 22:40:28 +00:00
Glenn Maynard
9c867fdd70
We have two "gamestate Lua environments": mapEnv and m_Environment. The
...
former is a map<CString,CString>; the latter is a Lua table. The former
is reset on gamestate reset, the latter is not.
Merge the map into the table, and eliminate it. We only need one, and
it makes sense for a Lua environment to be a Lua table.
Do reset the table on Reset. Otherwise, there's little point; if you want
to store data inside Lua, you don't need GameState to help.
2006-01-13 21:49:35 +00:00
Glenn Maynard
4b072e00a3
update
...
make ScreenMapControllers fit
2006-01-13 08:04:37 +00:00
Glenn Maynard
51a2d29493
unuseds
2006-01-13 06:50:16 +00:00
Glenn Maynard
623a604b71
unused
2006-01-13 06:48:06 +00:00
Glenn Maynard
c0de3d0397
remove unused stuff
2006-01-13 06:35:46 +00:00
Glenn Maynard
d876fa5ecb
fix in gcc
2006-01-13 06:34:12 +00:00
Glenn Maynard
e3b8969de3
direct
2006-01-13 05:58:46 +00:00
Glenn Maynard
b599c37134
simplify
2006-01-13 05:57:18 +00:00
Glenn Maynard
68b9637eb9
quick compile fix (coming back to this ...)
2006-01-13 05:55:45 +00:00
Glenn Maynard
e0c8035435
PlayerState::LaunchAttack, RemoveActiveAttacks, missed commit
2006-01-13 05:51:37 +00:00
Glenn Maynard
09c419f482
PlayerState::LaunchAttack, RemoveActiveAttacks
2006-01-13 05:49:27 +00:00
Glenn Maynard
f61f021f1f
PlayerState::LaunchAttack
2006-01-13 05:47:44 +00:00
Glenn Maynard
949eafd8b8
missed commit
2006-01-13 05:47:11 +00:00
Glenn Maynard
8e0b4e9fed
simplify
2006-01-13 05:28:49 +00:00
Glenn Maynard
c84fa02dd2
bypass GameState and launch the attack directly to the state, for
...
more obviously consistent behavior
2006-01-13 05:22:02 +00:00
Glenn Maynard
56d209b24f
cleanup, style
2006-01-13 05:16:04 +00:00
Glenn Maynard
75120c7a12
migrate some stuff to PlayerState
2006-01-13 05:14:42 +00:00
Glenn Maynard
e927fa4022
move stuff out of header
2006-01-13 05:02:44 +00:00
Glenn Maynard
269c6f0ec7
Make a simple interface class for localizers. Move the theme-based
...
localizer into ThemeManager. Use simple MI to hook ThemeMetric::Read
to continue to automatically update when needed.
2006-01-13 00:40:12 +00:00
Glenn Maynard
c827c9ec1e
unused
2006-01-13 00:36:37 +00:00