Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18363/src/sim
Modified Files:
Game.cpp
Log Message:
Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -d -r1.151 -r1.152
*** Game.cpp 23 Mar 2006 01:11:02 -0000 1.151
--- Game.cpp 27 Mar 2006 01:08:17 -0000 1.152
***************
*** 4,8 ****
/* Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
** All rights reserved.
! **
** This file is part of the Global Conflict Blue (GCB) program.
** GCB is free software; you can redistribute it and/or modify
--- 4,8 ----
/* Copyright (C) 2003-2005 Dewitt Colclough (de...@gc...)
** All rights reserved.
!
** This file is part of the Global Conflict Blue (GCB) program.
** GCB is free software; you can redistribute it and/or modify
***************
*** 66,70 ****
#include "tcDatabaseInfoWindow.h"
#include "tcGenericDBObject.h"
!
#if defined(_MSC_VER)
--- 66,70 ----
#include "tcDatabaseInfoWindow.h"
#include "tcGenericDBObject.h"
! #include "tcDatabaseViewer.h"
#if defined(_MSC_VER)
***************
*** 92,95 ****
--- 92,96 ----
EVT_COMMAND(ID_STARTVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToStart)
EVT_COMMAND(ID_CREDITVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToCredit)
+ EVT_COMMAND(ID_DATABASEVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToDatabaseView)
EVT_COMMAND(ID_DISPLAYSETTINGS, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToDisplaySettings)
EVT_COMMAND(ID_OPTIONSVIEW, wxEVT_COMMAND_BUTTON_CLICKED , tcGame::SwitchToOptions)
***************
*** 401,404 ****
--- 402,411 ----
}
+ void tcGame::SwitchToDatabaseView(wxCommandEvent& event)
+ {
+ meScreenMode = DATABASEVIEW;
+ }
+
+
void tcGame::SwitchToDisplaySettings(wxCommandEvent& event)
{
***************
*** 526,538 ****
InitializeGameWindow();
-
- /*
- test3DWindow =
- new tc3DWindow(viewer, wxPoint(0, 0), wxSize(150, 80), "Test3DWindow");
- test3DWindow->SetActive(true);
- */
-
- /* start view has to be initialized first so that we can
- share its 2D surface with the other windows */
InitializeCreditView();
InitializeDisplaySettingsView();
--- 533,536 ----
***************
*** 590,593 ****
--- 588,593 ----
tcLauncherState::mpDatabase = database;
+ InitializeDatabaseViewer();
+
/* ** Initialize mcMapData * **/
mapData->AttachOptions(tcOptions::Get());
***************
*** 865,868 ****
--- 865,886 ----
/**
+ * Initializes the database viewer
+ */
+ void tcGame::InitializeDatabaseViewer()
+ {
+ wxASSERT(glCanvas);
+
+ databaseViewer =
+ new tcDatabaseViewer(glCanvas, wxPoint(0,0), frameSize, "DatabaseViewer");
+
+ if (databaseViewer == 0)
+ {
+ throw exception();
+ }
+
+ databaseViewer->SetActive(false);
+ }
+
+ /**
* Initializes tcDirector object
*/
***************
*** 912,916 ****
/**
* Initializes the Select Scenario View screen.
- *
*/
void tcGame::InitializeScenarioSelectView()
--- 930,933 ----
***************
*** 1464,1468 ****
optionsView->SetActive(false);
creditView->SetActive(false);
! displaySettingsView->SetActive(false);
scenarioSelectView->SetActive(false);
messageCenter->SetActive(false);
--- 1481,1486 ----
optionsView->SetActive(false);
creditView->SetActive(false);
! databaseViewer->SetActive(false);
! displaySettingsView->SetActive(false);
scenarioSelectView->SetActive(false);
messageCenter->SetActive(false);
***************
*** 1487,1490 ****
--- 1505,1512 ----
creditView->Draw();
break;
+ case DATABASEVIEW:
+ databaseViewer->SetActive(true);
+ databaseViewer->Draw();
+ break;
case OPTIONS:
optionsView->SetActive(true);
***************
*** 1604,1607 ****
--- 1626,1630 ----
briefingView->SetActive(false);
chatBox->SetActive(false);
+ databaseViewer->SetActive(false);
displaySettingsView->SetActive(false);
hookInfo->SetActive(false);
***************
*** 1711,1715 ****
{
briefingView->SetActive(true);
-
briefingView->Draw();
}
--- 1734,1737 ----
***************
*** 1717,1721 ****
{
optionsView->SetActive(true);
-
optionsView->Draw();
}
--- 1739,1742 ----
***************
*** 1723,1727 ****
{
messageCenter->SetActive(true);
-
messageCenter->Draw();
}
--- 1744,1747 ----
***************
*** 1729,1739 ****
{
networkView->SetActive(true);
-
networkView->Draw();
}
else if (meScreenMode == DISPLAYSETTINGS)
{
displaySettingsView->SetActive(true);
-
displaySettingsView->Draw();
}
--- 1749,1762 ----
{
networkView->SetActive(true);
networkView->Draw();
}
+ else if (meScreenMode == DATABASEVIEW)
+ {
+ databaseViewer->SetActive(true);
+ databaseViewer->Draw();
+ }
else if (meScreenMode == DISPLAYSETTINGS)
{
displaySettingsView->SetActive(true);
displaySettingsView->Draw();
}
|
