Ratstail91/Tortuga
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed debug code from the editor

Browse Source
This commit is contained in:
Kayne Ruse
2013-10-07 02:32:36 +11:00
parent 65a3937592
commit 600ec6789b
3 changed files with 9 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/editor_scene.cpp
+8 -27
View File
@@ -38,31 +38,16 @@ EditorScene::EditorScene() {
pager.SetWidth(32*4); pager.SetWidth(32*4);
pager.SetHeight(32*4); pager.SetHeight(32*4);
pager.SetOnNew([](Region* const ptr){ // pager.SetOnNew([](Region* const ptr){
printf("New Region: %d, %d\n", ptr->GetX(), ptr->GetY()); // printf("New Region: %d, %d\n", ptr->GetX(), ptr->GetY());
}); // });
pager.SetOnDelete([](Region* const ptr){ // pager.SetOnDelete([](Region* const ptr){
printf("Delete Region: %d, %d\n", ptr->GetX(), ptr->GetY()); // printf("Delete Region: %d, %d\n", ptr->GetX(), ptr->GetY());
}); // });
sheetList.push_front(TileSheet()); sheetList.push_front(TileSheet());
TileSheet* sheetOne = &sheetList.front(); sheetList.front().LoadSurface("rsc\\graphics\\tilesets\\terrain.bmp", 32, 32);
sheetList.push_front(TileSheet());
TileSheet* sheetTwo = &sheetList.front();
sheetOne->LoadSurface("rsc\\terrain.bmp", 32, 32);
sheetTwo->LoadSurface("rsc\\terrain.bmp", 32, 32);
cout << "--Sheet debug data--" << endl;
cout << "TileSheet::rangeEnd: " << TileSheet::GetRangeEnd() << endl;
cout << "sheetOne.totalCount: " << sheetOne->GetTotalCount() << endl;
cout << "sheetOne.begin: " << sheetOne->GetBegin() << endl;
cout << "sheetOne.end: " << sheetOne->GetEnd() << endl;
cout << "sheetTwo.totalCount: " << sheetTwo->GetTotalCount() << endl;
cout << "sheetTwo.begin: " << sheetTwo->GetBegin() << endl;
cout << "sheetTwo.end: " << sheetTwo->GetEnd() << endl;
cout << "--end debug data--" << endl;
} }
EditorScene::~EditorScene() { EditorScene::~EditorScene() {
@@ -117,12 +102,8 @@ void EditorScene::MouseButtonDown(SDL_MouseButtonEvent const& button) {
0, 0,
32, 32,
32, 32,
incrementer 0
}); });
if (++incrementer >= TileSheet::GetRangeEnd()) {
incrementer = 0;
}
} }
} }
} }
editor/editor_scene.hpp
-3
View File
@@ -56,9 +56,6 @@ protected:
struct { struct {
int x = 0, y = 0; int x = 0, y = 0;
} camera; } camera;
//debugging
int incrementer = 0;
}; };
#endif #endif
server/server_application.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ void ServerApplication::Init(int argc, char** argv) {
} }
//Run setup scripts //Run setup scripts
std::ifstream is("rsc/setup_server.sql"); std::ifstream is("rsc\\scripts\\setup_server.sql");
if (!is.is_open()) { if (!is.is_open()) {
throw(std::runtime_error("Failed to run database setup script")); throw(std::runtime_error("Failed to run database setup script"));
} }