martin/fysxasteroids
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

beta 2 + editor for the windows version

Browse Source
This commit is contained in:
martin
2011-02-13 15:31:42 +01:00
parent 5359374304
commit 2cb35eab1f
8 changed files with 61 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asteroids/View.cc
+12 -5
View File
@@ -476,6 +476,11 @@ void View::DrawPageTitle (const std::string& title) {
void View::DrawUiMainMenu() {
DrawPageTitle ("Asteroids");
SelectFont("console.ttf size=23 color=#444444");
DrawGLString( screen_right - 272, screen_bottom - 16, "http://www.fysx.org");
SelectFont("console.ttf size=23 color=#cccccc");
DrawGLString( screen_right - 270, screen_bottom - 18, "http://www.fysx.org");
SelectFont("console.ttf size=23");
if (Engine::GUI::Button (1, "New Game", screen_right * 0.5 - 100, 200, button_width, button_height)) {
PushViewState(ViewStateEnterPlayername);
@@ -489,10 +494,12 @@ void View::DrawUiMainMenu() {
PushViewState(ViewStateShowHighscore);
}
/*
if (Engine::GUI::Button (6, "E", screen_right - 48, 20, 32, button_height)) {
PushViewState(ViewStateEditor);
GetController()->ResetLevel();
}
*/
if (Engine::GUI::Button (4, "Quit", screen_right * 0.5 - 100, 380, button_width, button_height)) {
Engine::RunCommand("quit");
@@ -574,7 +581,7 @@ void View::DrawUiLevelComplete() {
GetModel()->SetGameState(GameStatePaused);
if (mEditorState == EditorStateTest) {
GetModel()->DoLoadLevel("level_edit_temp.txt");
GetModel()->DoLoadLevel("level_edit_temp.map");
mEditorState = EditorStateUnknown;
}
} else {
@@ -617,14 +624,14 @@ void View::DrawUiPlayerDied() {
if (Engine::GUI::Button (1, "Continue", screen_right * 0.5 - 100, 380, button_width, button_height)) {
PopViewState();
// we have to take care when we are testing the level to not proceed to
// the next level...
if (GetViewState() == ViewStateEditor) {
GetModel()->SetGameState(GameStatePaused);
if (mEditorState == EditorStateTest) {
GetModel()->DoLoadLevel("level_edit_temp.txt");
GetModel()->DoLoadLevel("level_edit_temp.map");
mEditorState = EditorStateUnknown;
}
} else {
@@ -777,7 +784,7 @@ void View::DrawUiEditor() {
if (mEditorState == EditorStateTest) {
mEditorState = EditorStateUnknown;
GetModel()->DoLoadLevel("level_edit_temp.txt");
GetModel()->DoLoadLevel("level_edit_temp.map");
GetModel()->SetGameState(GameStatePaused);
return;
} else if (!Engine::GUI::CheckKeyPressed(SDLK_ESCAPE)){
@@ -835,7 +842,7 @@ void View::DrawUiEditor() {
if (Engine::GUI::Button (9, "Test", 475, 20, 64, button_height)) {
mEditorState = EditorStateTest;
GetModel()->DoSaveLevel("level_edit_temp.txt");
GetModel()->DoSaveLevel("level_edit_temp.map");
GetModel()->SetGameState(GameStateRunning);
}
}