Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22778/network
Modified Files:
uosocket.cpp
Log Message:
season stuff
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.422
retrieving revision 1.423
diff -C2 -d -r1.422 -r1.423
*** uosocket.cpp 1 Oct 2004 10:14:52 -0000 1.422
--- uosocket.cpp 6 Oct 2004 00:02:37 -0000 1.423
***************
*** 714,719 ****
if (Config::instance()->enableFeluccaSeason() && _player->pos().map == 0) {
season.setSeason( ST_DESOLATION );
! } else {
season.setSeason( ST_SPRING );
}
send( &season );
--- 714,721 ----
if (Config::instance()->enableFeluccaSeason() && _player->pos().map == 0) {
season.setSeason( ST_DESOLATION );
! } else if (Config::instance()->enableTrammelSeason() && _player->pos().map == 1) {
season.setSeason( ST_SPRING );
+ } else {
+ season.setSeason( ST_SUMMER );
}
send( &season );
***************
*** 1552,1557 ****
if (Config::instance()->enableFeluccaSeason() && _player->pos().map == 0) {
season.setSeason( ST_DESOLATION );
! } else {
season.setSeason( ST_SPRING );
}
send( &season );
--- 1554,1561 ----
if (Config::instance()->enableFeluccaSeason() && _player->pos().map == 0) {
season.setSeason( ST_DESOLATION );
! } else if (Config::instance()->enableTrammelSeason() && _player->pos().map == 1) {
season.setSeason( ST_SPRING );
+ } else {
+ season.setSeason( ST_SUMMER );
}
send( &season );
|
