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

Reviewing the progress so far

Browse Source
This commit is contained in:
Kayne Ruse
2013-06-05 03:50:46 +10:00
parent 0cfb47e641
commit dfac9c1518
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/in_game.hpp
+1 -1
View File
@@ -33,7 +33,7 @@ protected:
ConfigUtility* configUtil = nullptr; ConfigUtility* configUtil = nullptr;
SurfaceManager* surfaceMgr = nullptr; SurfaceManager* surfaceMgr = nullptr;
UDPNetworkUtility* netUtil = nullptr; UDPNetworkUtility* netUtil = nullptr;
int* playerID; int* playerID = nullptr;
}; };
#endif #endif
client/lobby.cpp
+4 -3
View File
@@ -122,6 +122,7 @@ void Lobby::Render(SDL_Surface* const screen) {
//if a server has been selected, and this is the selected server //if a server has been selected, and this is the selected server
if (selectedServer && selectedServer == &serverVector[i]) { if (selectedServer && selectedServer == &serverVector[i]) {
//draw the orange box
SDL_FillRect(screen, &clip, SDL_MapRGB(screen->format, 255, 127, 39)); SDL_FillRect(screen, &clip, SDL_MapRGB(screen->format, 255, 127, 39));
} }
font.DrawStringTo(serverVector[i].name, screen, clip.x, clip.y); font.DrawStringTo(serverVector[i].name, screen, clip.x, clip.y);
@@ -148,14 +149,14 @@ void Lobby::MouseButtonUp(SDL_MouseButtonEvent const& button) {
if (buttonMap["ping"]->MouseButtonUp(button) == Button::State::HOVER) { if (buttonMap["ping"]->MouseButtonUp(button) == Button::State::HOVER) {
PingNetwork(); PingNetwork();
} }
if (buttonMap["join"]->MouseButtonUp(button) == Button::State::HOVER) { else if (buttonMap["join"]->MouseButtonUp(button) == Button::State::HOVER) {
JoinRequest(selectedServer); JoinRequest(selectedServer);
} }
if (buttonMap["back"]->MouseButtonUp(button) == Button::State::HOVER) { else if (buttonMap["back"]->MouseButtonUp(button) == Button::State::HOVER) {
SetNextScene(SceneList::MAINMENU); SetNextScene(SceneList::MAINMENU);
} }
//select a server (clicked within the bounds of the server box) //select a server (clicked within the bounds of the server box)
if (button.x > listBox.x && button.y > listBox.y && button.y < serverVector.size() * font.GetCharH() + listBox.y) { else if (button.x > listBox.x && button.y > listBox.y && button.y < serverVector.size() * font.GetCharH() + listBox.y) {
selectedServer = &serverVector[(button.y-listBox.y)/font.GetCharH()]; selectedServer = &serverVector[(button.y-listBox.y)/font.GetCharH()];
} }
else { else {
docs/TODO.txt
+5 -1
View File
@@ -4,4 +4,8 @@ Each client needs to know about each other client now.
Have multiple players moving around the server at the same time Have multiple players moving around the server at the same time
keep the docs up to date!!!!! keep the docs up to date!!!!!
Player's internals a weird. Player's internals a weird.
clarify some of the names in the server project
reimplement the server's time system.
Overall, I think the server needs restructuring