Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1752 for code/trunk


Ignore:
Timestamp:
Sep 9, 2008, 8:28:24 PM (16 years ago)
Author:
landauf
Message:
  • removed #include "core/CoreIncludes.h" from Gamestate.h and put it into the .cc files
  • removed a warning in Client.cc
Location:
code/trunk/src
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/network/Client.cc

    r1751 r1752  
    5050{
    5151//   SetConsoleCommandShortcut(Client, chat);
    52  
    53  
     52
     53
    5454  /**
    5555  * Constructor for the Client class
     
    9292      closeConnection();
    9393  }
    94  
     94
    9595  /**
    9696  * Establish the Connection to the Server
     
    121121    return client_connection.addPacket(packet);
    122122  }
    123  
     123
    124124  bool Client::processChat(packet::Chat *message, unsigned int clientID){
    125125    return message->process();
    126126  }
    127  
     127
    128128  /*bool Client::sendChat(packet::Chat *chat){
    129129    chat->process();
     
    131131    return p->send();
    132132  }*/
    133  
     133
    134134
    135135  /**
     
    173173    if(gameStateID==GAMESTATEID_INITIAL)
    174174      if(gameStateFailure_){
    175         packet::Acknowledgement *ack = new packet::Acknowledgement(GAMESTATEID_INITIAL, 0);
     175        packet::Acknowledgement *ack = new packet::Acknowledgement((unsigned int)GAMESTATEID_INITIAL, 0);
    176176        if(!ack->send())
    177177          COUT(3) << "could not (negatively) ack gamestate" << std::endl;
    178         else 
     178        else
    179179          COUT(4) << "negatively acked a gamestate" << std::endl;
    180180        }
  • code/trunk/src/network/GamestateClient.h

    r1751 r1752  
    6767  private:
    6868    packet::Gamestate *processGamestate(packet::Gamestate *gs);
    69     void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
     69    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
    7070    void printGamestateMap();
    7171    bool saveShipCache();
  • code/trunk/src/network/Server.cc

    r1751 r1752  
    5050#include "objects/SpaceShip.h"
    5151#include "core/ConsoleCommand.h"
     52#include "core/CoreIncludes.h"
    5253#include "core/Iterator.h"
    5354#include "packet/Chat.h"
  • code/trunk/src/network/packet/Gamestate.cc

    r1751 r1752  
    3030#include "network/ClientInformation.h"
    3131#include "network/GamestateHandler.h"
     32#include "core/CoreIncludes.h"
    3233#include "core/Iterator.h"
    3334
     
    267268  assert(HEADER->crc32==calcCRC(ndata+sizeof(GamestateHeader), HEADER->normsize));
    268269#endif
    269  
     270
    270271  //copy over the header
    271272  *GAMESTATE_HEADER(ndata) = *HEADER;
     
    386387    return HEADER->compressed;
    387388  }
    388  
     389
    389390  int Gamestate::getBaseID(){
    390391    return HEADER->base_id;
  • code/trunk/src/network/packet/Gamestate.h

    r1751 r1752  
    3232#include "util/CRC32.h"
    3333#endif
    34 #include "core/CoreIncludes.h"
    3534
    3635#ifndef NETWORK_PACKETGAMESTATE_H
     
    8382  private:
    8483    unsigned int calcGamestateSize(unsigned int id, int mode=0x0);
    85     void removeObject(orxonox::ObjectList<Synchronisable>::iterator &it);
     84    void removeObject(orxonox::ObjectListIterator<Synchronisable> &it);
    8685
    8786
  • code/trunk/src/orxonox/Orxonox.cc

    r1747 r1752  
    5454// core
    5555#include "core/ConfigFileManager.h"
     56#include "core/CoreIncludes.h"
    5657#include "core/Iterator.h"
    5758#include "core/ConsoleCommand.h"
     
    185186        it->setSpeedFactor(it->getSpeedFactor() * change);
    186187
    187     for (Iterator<Backlight> it = ObjectList<Backlight>::begin(); it; ++it)
     188    for (ObjectList<Backlight>::iterator it = ObjectList<Backlight>::begin(); it; ++it)
    188189        it->setTimeFactor(Orxonox::getSingleton()->getTimeFactor());
    189190  }
Note: See TracChangeset for help on using the changeset viewer.