$NetBSD: patch-al,v 1.2 2004/02/18 23:09:03 kristerw Exp $ --- Client/WormApp.cc.orig Tue Apr 7 14:34:35 1998 +++ Client/WormApp.cc Wed Feb 18 23:48:19 2004 @@ -1,3 +1,4 @@ +#include "stdlib.h" #include "WormApp.hh" #include "XVision/Menu.hh" #include "PaintInterface/TargaPicture.hh" @@ -36,7 +37,7 @@ void Show(); }; -WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align=VAVertical) +WormMenu::WormMenu(StaticText * _title, const char * _text, const Align _align) : Menu(_align), title(_title), text(_text) { } @@ -228,7 +229,7 @@ Application::Initialize(); } -void WormApp::SwitchMenu(bool Flip=TRUE, bool DoShow=TRUE) +void WormApp::SwitchMenu(bool Flip, bool DoShow) { if (!Flip && ((Visible && DoShow) || (!Visible && !DoShow))) return; @@ -374,7 +375,7 @@ sprintf(s, "Player %s wins round %i!", w->GetName(), current_round); else sp = "No winner"; - TypeText(sp, Pixel_t_HiBlue, usec2sec, &EndRoundCallback1); + TypeText(sp, Pixel_t_HiBlue, usec2sec, &WormApp::EndRoundCallback1); } void WormApp::EndRoundCallback1() @@ -401,13 +402,13 @@ players->NewRound(); char s[40]; sprintf(s, "Round %i of %i", current_round, rounds); - TypeText(s, Pixel_t_Blue, usec2sec, &StartRoundCallback1); + TypeText(s, Pixel_t_Blue, usec2sec, &WormApp::StartRoundCallback1); } void WormApp::StartRoundCallback1() { players->DrawAll(); - TypeText("GET READY!", Pixel_t_Red, usec2sec, &StartRoundCallback2); + TypeText("GET READY!", Pixel_t_Red, usec2sec, &WormApp::StartRoundCallback2); } void WormApp::StartRoundCallback2() @@ -455,7 +456,7 @@ RecvChatLine(network->status); } -void WormApp::CreateServer(bool OnlySetHostname=FALSE) +void WormApp::CreateServer(bool OnlySetHostname) { char s[max_hostname_len]; strcpy(s, default_server_hostname);