diff options
Diffstat (limited to 'Stars45/Starshatter.cpp')
| -rw-r--r-- | Stars45/Starshatter.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Stars45/Starshatter.cpp b/Stars45/Starshatter.cpp index 4e33b26..348538d 100644 --- a/Stars45/Starshatter.cpp +++ b/Stars45/Starshatter.cpp @@ -169,9 +169,9 @@ enum CHAT_MODES { Starshatter::Starshatter() : gamewin(0), menuscreen(0), loadscreen(0), planscreen(0), -cmpnscreen(0), gamescreen(0), splash(0), splash_index(0), +cmpnscreen(0), gamescreen(0), splash(0), splash_index(0), input(0), loader(0), cam_dir(0), music_dir(0), -field_of_view(2), time_mark(0), minutes(0), +field_of_view(2), time_mark(0), minutes(0), player_ship(0), net_lobby(0), spinning(false), tactical(false), mouse_x(0), mouse_y(0), game_mode(MENU_MODE), mouse_input(0), head_tracker(0), @@ -375,7 +375,7 @@ Starshatter::MapKeys(KeyMap* mapping, int nkeys) { for (int i = 0; i < nkeys; i++) { KeyMapEntry* k = mapping->GetKeyMap(i); - + if (k->act >= KEY_MAP_FIRST && k->act <= KEY_MAP_LAST) MapKey(k->act, k->key, k->alt); } @@ -1422,7 +1422,7 @@ Starshatter::DoLoadScreenFrame() RadioTraffic::Initialize(); RadioView::Initialize(); TacticalView::Initialize(); - + if (!gamescreen && game_mode != PREP_MODE) SetupGameScreen(); @@ -1579,7 +1579,7 @@ Starshatter::DoGameScreenFrame() } player_ship = sim->GetPlayerShip(); - + if (player_ship) { // warp effect: if (player_ship->WarpFactor() > 1) { @@ -1594,8 +1594,8 @@ Starshatter::DoGameScreenFrame() gamescreen->SetFieldOfView(field_of_view); } - gamescreen->ShowExternal(); - + gamescreen->ShowExternal(); + if (CameraDirector::GetCameraMode() >= CameraDirector::MODE_ORBIT && !player_ship->InTransition()) tactical = true; else @@ -1657,7 +1657,7 @@ Starshatter::DoGameKeys() PlayerCam(CameraDirector::MODE_ORBIT); time_til_change = 0.5; } - + else if (KeyDown(KEY_TARGET_PADLOCK)) { PlayerCam(CameraDirector::MODE_TARGET); time_til_change = 0.5; @@ -1679,7 +1679,7 @@ Starshatter::DoGameKeys() if (player_ship && player_ship->WarpFactor() <= 1) gamescreen->SetFieldOfView(field_of_view); } - + else if (!exit_latch && KeyDown(KEY_EXIT)) { exit_latch = true; time_til_change = 0.5; @@ -1822,7 +1822,7 @@ Starshatter::DoGameKeys() else if (KeyDown(KEY_SELF_DESTRUCT)) { time_til_change = 0.5; - + if (player_ship && !player_ship->InTransition()) { double damage = player_ship->Design()->scuttle; @@ -2092,7 +2092,7 @@ Starshatter::DoChatMode() NetUtil::SendChat(player_ship->GetIFF()+1, name, chat_text); } break; - + case CHAT_WING: if (player_ship) { Element* elem = player_ship->GetElement(); @@ -2454,7 +2454,7 @@ Starshatter::LoadVideoConfig(const char* filename) delete term; term = parser.ParseTerm(); - + if (term) { TermDef* def = term->isDef(); if (def) { |