Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 918


Ignore:
Timestamp:
Mar 22, 2008, 9:17:34 PM (16 years ago)
Author:
rgrieder
Message:
  • created basic construct for the InputHandler (mere copy of InputManager but without the Listeners)
  • some msvc related fixes with winsocks.h and winsocks2.h
  • fix in Tickable.h (due to lazy displacement to new folder)
Location:
code/branches/network
Files:
2 added
13 edited

Legend:

Unmodified
Added
Removed
  • code/branches/network/src/network/Client.h

    r917 r918  
    1616#include <string>
    1717
     18#include "NetworkPrereqs.h"
     19
    1820#include "core/Tickable.h"
    19 
    20 #include "NetworkPrereqs.h"
    2121#include "ClientConnection.h"
    2222#include "PacketManager.h"
  • code/branches/network/src/network/Server.cc

    r917 r918  
    1313#include <iostream>
    1414
    15 #include "util/Sleep.h"
    1615#include "ConnectionManager.h"
    1716#include "PacketTypes.h"
     
    1918#include "ClientInformation.h"
    2019//#include "NetworkFrameListener.h"
     20#include "util/Sleep.h"
    2121#include "Server.h"
    2222
  • code/branches/network/src/network/Server.h

    r917 r918  
    1616#include <string>
    1717
     18#include "NetworkPrereqs.h"
     19
    1820#include "core/Tickable.h"
    19 
    2021#include "PacketManager.h"
    21 #include "NetworkPrereqs.h"
    2222
    2323
  • code/branches/network/src/orxonox/Main.cc

    r790 r918  
    7676#define WIN32_LEAN_AND_MEAN
    7777#endif
    78 #include "windows.h"
     78#include <windows.h>
    7979  INT WINAPI WinMain(HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT)
    8080  {
  • code/branches/network/src/orxonox/Orxonox.cc

    r917 r918  
    6464#include "network/Server.h"
    6565#include "network/Client.h"
    66 #include "network/NetworkPrereqs.h"
    6766network::Client *client_g;
    6867network::Server *server_g;
     
    7978#include "hud/HUD.h"
    8079#include "objects/weapon/BulletManager.h"
    81 #include "GraphicsEngine.h"
    8280
    8381#include "Orxonox.h"
     
    434432  /**
    435433    Main loop of the orxonox game.
    436     This is a new solution, using the ogre engine instead of beeing used by it.
     434    This is a new solution, using the ogre engine instead of being used by it.
    437435    An alternative solution would be to simply use the timer of the Root object,
    438436    but that implies using Ogre in any case. There would be no way to test
  • code/branches/network/src/orxonox/Orxonox.h

    r917 r918  
    1515
    1616#include "OrxonoxPrereqs.h"
    17 //#include "loader/LoaderPrereqs.h"
    1817#include "audio/AudioPrereqs.h"
    1918
  • code/branches/network/src/orxonox/OrxonoxStableHeaders.h

    r917 r918  
    4141
    4242// not including the entire Ogre.h doesn't exceed the default heap size for pch
     43#ifndef WIN32_LEAN_AND_MEAN
     44// prevent Ogre from including winsock.h that messes with winsock2.h from enet
     45#  define WIN32_LEAN_AND_MEAN
     46#endif
    4347//#include <Ogre.h>
    44 #include <OgreBillboardSet.h>
    45 #include <OgreCamera.h>
    46 #include <OgreConfigFile.h>
     48//#include <OgreBillboardSet.h>
     49//#include <OgreCamera.h>
     50//#include <OgreConfigFile.h>
    4751#include <OgreEntity.h>
    4852#include <OgreException.h>
    49 #include <OgreFrameListener.h>
     53//#include <OgreFrameListener.h>
    5054#include <OgreLight.h>
    51 #include <OgreOverlay.h>
    52 #include <OgreOverlayElement.h>
    53 #include <OgreOverlayManager.h>
     55//#include <OgreOverlay.h>
     56//#include <OgreOverlayElement.h>
     57//#include <OgreOverlayManager.h>
    5458#include <OgreParticleEmitter.h>
    5559#include <OgreParticleSystem.h>
    5660#include <OgrePlatform.h>
    5761#include <OgrePrerequisites.h>
    58 #include <OgreRenderWindow.h>
    59 #include <OgreRoot.h>
     62//#include <OgreRenderWindow.h>
     63//#include <OgreRoot.h>
    6064#include <OgreSceneManager.h>
    6165#include <OgreSceneNode.h>
    6266#include <OgreStringConverter.h>
    63 #include <OgreTextureManager.h>
    64 #include <OgreViewport.h>
     67//#include <OgreTextureManager.h>
     68//#include <OgreViewport.h>
    6569
    6670#include <OIS/OIS.h>
     
    6872/**
    6973* Some of the not so stable header files.
    70 * But it's not very useful to include them anyway..
     74* It's not very useful to include them anyway..
    7175**/
    72 
    73 //#include "audio/AudioManager.h"
    7476
    7577#include "core/CoreIncludes.h"
    7678#include "core/BaseObject.h"
    77 //#include "core/ArgReader.h"
     79#include "core/Tickable.h"
    7880#include "core/Error.h"
    7981#include "core/Loader.h"
    8082#include "core/XMLPort.h"
    81 #include "core/Tickable.h"
    8283
    8384#include "network/Synchronisable.h"
     
    100101#include "util/tinyxml/tinyxml.h"
    101102
    102 //#include "hud/HUD.h"
    103 //#include "loader/LevelLoader.h"
    104 //#include "objects/weapon/AmmunitionDump.h"
    105 //#include "objects/weapon/BarrelGun.h"
    106 //#include "objects/weapon/Bullet.h"
    107 //#include "objects/weapon/BulletManager.h"
    108 //#include "objects/weapon/WeaponStation.h"
    109 //#include "objects/Ambient.h"
    110 //#include "objects/Camera.h"
    111 //#include "objects/Explosion.h"
    112 //#include "objects/Fighter.h"
    113103#include "objects/Model.h"
    114 //#include "objects/NPC.h"
    115 //#include "objects/Projectile.h"
    116 //#include "objects/Skybox.h"
    117 //#include "objects/SpaceShipSteeringObject.h"
    118104#include "objects/WorldEntity.h"
    119 //#include "particle/ParticleInterface.h"
    120 //#include "tools/BillboardSet.h"
    121 //#include "tools/Light.h"
    122 //#include "tools/Mesh.h"
    123 //#include "tools/Timer.h"
    124 //#include "GraphicsEngine.h"
    125 //#include "InputManager.h"
    126 //#include "Orxonox.h"
    127 //#include "SpaceshipSteering.h"
    128105
    129106#endif
  • code/branches/network/src/orxonox/PrecompiledHeaderFiles.cc

    r790 r918  
    2727
    2828/**
    29  @file  PrecompiledHeaderFiles.cc
     29 @file
    3030 @brief This file actually generates the precompiled header file
    3131 */
  • code/branches/network/src/orxonox/core/BaseObject.cc

    r871 r918  
    2727
    2828/**
    29     @file BaseObject.cc
     29    @file
    3030    @brief Implementation of the BaseObject class.
    3131*/
  • code/branches/network/src/orxonox/core/Tickable.cc

    r917 r918  
    2626 */
    2727
    28 #include "OrxonoxStableHeaders.h"
    29 
    3028#include "core/CoreIncludes.h"
    3129#include "Tickable.h"
  • code/branches/network/src/orxonox/core/Tickable.h

    r917 r918  
    4141#define _Tickable_H__
    4242
    43 #include "../OrxonoxPrereqs.h"
     43#include "CorePrereqs.h"
    4444#include "core/OrxonoxClass.h"
    4545
  • code/branches/network/visual_studio/network_properties.vsprops

    r790 r918  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 PreprocessorDefinitions="NETWORK_SHARED_BUILD; WIN32_LEAN_AND_MEAN; ZLIB_WINAPI "
     10                PreprocessorDefinitions="NETWORK_SHARED_BUILD; ZLIB_WINAPI;WIN32_LEAN_AND_MEAN"
    1111        />
    1212        <Tool
  • code/branches/network/visual_studio/vc8/orxonox.vcproj

    r917 r918  
    285285                        </File>
    286286                        <File
     287                                RelativePath="..\..\src\orxonox\InputHandler.cc"
     288                                >
     289                        </File>
     290                        <File
    287291                                RelativePath="..\..\src\orxonox\InputManager.cc"
    288292                                >
     
    655659                        </File>
    656660                        <File
     661                                RelativePath="..\..\src\orxonox\InputHandler.h"
     662                                >
     663                        </File>
     664                        <File
    657665                                RelativePath="..\..\src\orxonox\InputManager.h"
    658666                                >
Note: See TracChangeset for help on using the changeset viewer.