equal
deleted
inserted
replaced
547 if ((!hwnet) || (!hwnet->isInRoom())) |
547 if ((!hwnet) || (!hwnet->isInRoom())) |
548 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
548 if (id == ID_PAGE_NETGAME || id == ID_PAGE_NETGAME) |
549 GoBack(); |
549 GoBack(); |
550 |
550 |
551 if (curid == ID_PAGE_ROOMSLIST || curid == ID_PAGE_CONNECTING) NetDisconnect(); |
551 if (curid == ID_PAGE_ROOMSLIST || curid == ID_PAGE_CONNECTING) NetDisconnect(); |
552 if (curid == ID_PAGE_NETGAME && hwnet) hwnet->partRoom(); |
552 if (curid == ID_PAGE_NETGAME && hwnet && hwnet.isInRoom()) hwnet->partRoom(); |
553 // need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick |
553 // need to work on this, can cause invalid state for admin quit trying to prevent bad state message on kick |
554 //if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom(); |
554 //if (curid == ID_PAGE_NETGAME && (!game || game->gameState != gsStarted)) hwnet->partRoom(); |
555 |
555 |
556 if (curid == ID_PAGE_SCHEME) |
556 if (curid == ID_PAGE_SCHEME) |
557 ammoSchemeModel->Save(); |
557 ammoSchemeModel->Save(); |