[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[netPanzer-CVS] netpanzer/src config.h DirectX/DirectSound/DSou...
|
From: |
Matthias Braun |
|
Subject: |
[netPanzer-CVS] netpanzer/src config.h DirectX/DirectSound/DSou... |
|
Date: |
Sat, 06 Sep 2003 06:34:30 -0400 |
CVSROOT: /cvsroot/netpanzer
Module name: netpanzer
Branch:
Changes by: Matthias Braun <address@hidden> 03/09/06 06:34:29
Modified files:
src : config.h
src/DirectX/DirectSound: DSound.cpp DSound.hpp
src/Lib : cMouse.hpp cTimeStamp.cpp cTimeStamp.hpp
src/Lib/2D : Surface.cpp
src/Lib/Interfaces: TimerInterface.cpp TimerInterface.hpp
src/Lib/View : cInputField.cpp
src/NetPanzer/Classes: BonusUnitPowerUp.cpp
EnemyRadarPowerUp.cpp UnitPowerUp.cpp
WorldInputCmdProcessor.cpp
src/NetPanzer/Classes/Weapons: BulletWeapon.cpp MissleWeapon.cpp
ShellWeapon.cpp Weapon.cpp
src/NetPanzer/Interfaces: ConsoleInterface.cpp GameManager.cpp
MouseInterface.cpp
ProjectileInterface.cpp
UnitInterface.cpp
src/NetPanzer/Port: Wrldsprt.cpp
src/NetPanzer/Structs: KeyScanCodeDefs.h
src/NetPanzer/Views/Game: AreYouSureResignView.cpp
HelpScrollView.cpp MiniMapView.cpp
WinnerMesgView.cpp
src/NetPanzer/Views/MainMenu: MenuTemplateView.cpp
src/NetPanzer/Views/MainMenu/Multi: FlagSelectionView.cpp
GetSessionHostView.cpp
GetSessionView.cpp
HostJoinTemplateView.cpp
HostView.cpp JoinView.cpp
MapSelectionView.cpp
UnitColorView.cpp
UnitSelectionView.cpp
Removed files:
src/Stub : Win32Mouse.hpp WinTimer.hpp
Log message:
-added a sound interface to UILib and converted DirectSound to it
(warning:
not tested on win32 yet)
-converted TimeStamp code to SDL
Patches:
Index: netpanzer/src/DirectX/DirectSound/DSound.cpp
diff -u netpanzer/src/DirectX/DirectSound/DSound.cpp:1.3
netpanzer/src/DirectX/DirectSound/DSound.cpp:1.4
--- netpanzer/src/DirectX/DirectSound/DSound.cpp:1.3 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/DirectX/DirectSound/DSound.cpp Sat Sep 6 06:34:28 2003
@@ -39,11 +39,8 @@
{
Enabled = false;
}
-//////////////////////////////////
-//////////////////////////////////
-
-HRESULT DirectSound::Initialize(HWND hWnd)
+bool DirectSound::Initialize()
{
HRESULT hr;
short index;
@@ -51,7 +48,7 @@
for(index = 0; index < MAX_NUM_SFX; index++)
{
m_pDSBuffer[index] = 0;
- PreviousVolume[index] = DSBVOLUME_MAX;
+ PreviousVolume[index] = DSBVOLUME_MAX;
/* if(index >= AMBIENT_START)
{
@@ -67,35 +64,33 @@
RandomCount = 0;
BattleSoundIndex = 0;
- UnitIndex = 0;
- VoiceIndex = 0;
+ UnitIndex = 0;
+ VoiceIndex = 0;
//DupBufferIndex = 0;
- AmbientIndex = 0;
+ AmbientIndex = 0;
+
+ hr = InitDirectSound(gapp.hwndApp);
- hr = InitDirectSound(hWnd);
+ if(hr == false)
+ {
+ Enabled = false;
+ return false;
+ }
- if(hr == false)
- {
- Enabled = false;
- return false;
- }
-
- hr = InitSoundEngine(hWnd);
-
- if(hr == false)
- {
- Enabled = false;
- return false;
- }
+ hr = InitSoundEngine(gapp.hwndApp);
- Enabled = true;
- return true;
+ if(hr == false)
+ {
+ Enabled = false;
+ return false;
+ }
+ Enabled = true;
+ return true;
}
//////////////////////////////////
//////////////////////////////////
-
HRESULT DirectSound::InitDirectSound(HWND hWnd)
{
@@ -265,11 +260,7 @@
//////////////////////////////////
//////////////////////////////////
-
-
-
-
-void DirectSound::ShutDownDirectSound()
+void DirectSound::shutdown()
{
//release the direct sound buffers--
short index;
Index: netpanzer/src/DirectX/DirectSound/DSound.hpp
diff -u netpanzer/src/DirectX/DirectSound/DSound.hpp:1.2
netpanzer/src/DirectX/DirectSound/DSound.hpp:1.3
--- netpanzer/src/DirectX/DirectSound/DSound.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/DirectX/DirectSound/DSound.hpp Sat Sep 6 06:34:28 2003
@@ -63,21 +63,8 @@
_unit_type_archer,
_not_applicable};
*/
-enum Event{ _selected,
- _deselected,
- _move_to,
- _target_enemy,
- _no_line_of_fire,
- _under_attack,
- _fire_gun,
- _hit_target,
- _miss_target,
- _scream,
- _random_battle,
- _blow_up_tank};
-
-class DirectSound : public PObject
+class DirectSound : public Sound
{
protected:
@@ -126,9 +113,8 @@
DirectSound();
- HRESULT Initialize(HWND hWnd);
-
- void ShutDownDirectSound();
+ void initialize();
+ void shutdown();
void PlayTankIdle();
void StopTankIdle();
@@ -141,7 +127,5 @@
};
-
-extern DirectSound dsound;
#endif
Index: netpanzer/src/Lib/2D/Surface.cpp
diff -u netpanzer/src/Lib/2D/Surface.cpp:1.4
netpanzer/src/Lib/2D/Surface.cpp:1.5
--- netpanzer/src/Lib/2D/Surface.cpp:1.4 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/2D/Surface.cpp Sat Sep 6 06:34:28 2003
@@ -15,8 +15,9 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifdef WIN32
#include <config.h>
+
+#ifdef WIN32
#include <io.h>
#endif
Index: netpanzer/src/Lib/Interfaces/TimerInterface.cpp
diff -u netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.3
netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.4
--- netpanzer/src/Lib/Interfaces/TimerInterface.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/Interfaces/TimerInterface.cpp Sat Sep 6 06:34:28 2003
@@ -19,6 +19,8 @@
#include <config.h>
#include "TimerInterface.hpp"
+bool gTimeSliceFlag = false;
+
TIMESTAMP TimerInterface::frameStartTime;
unsigned TimerInterface::framesUntilNextFPSUpdate = 0;
double TimerInterface::totalFPSGroupTime = 0;
Index: netpanzer/src/Lib/Interfaces/TimerInterface.hpp
diff -u netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.2
netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.3
--- netpanzer/src/Lib/Interfaces/TimerInterface.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/Interfaces/TimerInterface.hpp Sat Sep 6 06:34:28 2003
@@ -18,13 +18,6 @@
#ifndef __TimerInterface_hpp__
#define __TimerInterface_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
-#endif
-
-
-
#include "cTimeStamp.hpp"
extern bool gTimeSliceFlag;
Index: netpanzer/src/Lib/View/cInputField.cpp
diff -u netpanzer/src/Lib/View/cInputField.cpp:1.4
netpanzer/src/Lib/View/cInputField.cpp:1.5
--- netpanzer/src/Lib/View/cInputField.cpp:1.4 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/Lib/View/cInputField.cpp Sat Sep 6 06:34:28 2003
@@ -159,7 +159,7 @@
// Process the extendedChar accordingly.
switch (newExtendedChar)
{
- case SDLK_ENTER:
+ case SDLK_RETURN:
{
} break;
Index: netpanzer/src/Lib/cMouse.hpp
diff -u netpanzer/src/Lib/cMouse.hpp:1.3 netpanzer/src/Lib/cMouse.hpp:1.4
--- netpanzer/src/Lib/cMouse.hpp:1.3 Fri Sep 5 21:09:50 2003
+++ netpanzer/src/Lib/cMouse.hpp Sat Sep 6 06:34:28 2003
@@ -18,19 +18,17 @@
#ifndef __cMouse_hpp__
#define __cMouse_hpp__
-
-#if _MSC_VER > 1000
- #pragma once
+#ifdef USE_SDL
+#include <SDL.h>
+#endif
+#ifdef WIN32
+#include "Win32Mouse.hpp"
#endif
-
-
#include "Surface.hpp"
#include "Surface.hpp"
#include "iXY.hpp"
-#include "Win32Mouse.hpp"
-
#define LMOUSE_BUTTON_MASK 0x01
#define MMOUSE_BUTTON_MASK 0x02
#define RMOUSE_BUTTON_MASK 0x04
@@ -42,8 +40,10 @@
static unsigned char button_mask;
public:
- cMouse() {}
- ~cMouse() {}
+ cMouse()
+ {}
+ ~cMouse()
+ {}
// cMouse Operation Functions
static void draw(const Surface &dest); // Handles the drawing of the
cMouse cursor
@@ -52,30 +52,27 @@
static inline iXY getScreenPos ()
{
+#ifdef WIN32
long mouse_x, mouse_y;
-
Win32GetMousePos(&mouse_x, &mouse_y );
-
return iXY(mouse_x, mouse_y);
+#endif
+#ifdef USE_SDL
+ int x, y;
+ SDL_GetMouseState(&x, &y);
+ return iXY(x, y);
+#endif
}
static inline int getScreenX ()
{
- long mouse_x, mouse_y;
-
- Win32GetMousePos(&mouse_x, &mouse_y);
-
- return mouse_x;
+ return getScreenPos().x;
}
static inline int getScreenY ()
{
- long mouse_x, mouse_y;
-
- Win32GetMousePos(&mouse_x, &mouse_y);
-
- return mouse_y;
- }
+ return getScreenPos().y;
+ }
static inline void setButtonMask( unsigned char mask )
@@ -92,9 +89,7 @@
{
return( button_mask );
}
- //FIXME
- //static inline const int getCurButton () { return numButtons;
}
-
+
static void setPointer(Surface *pointer);
}; // end cMouse
Index: netpanzer/src/Lib/cTimeStamp.cpp
diff -u netpanzer/src/Lib/cTimeStamp.cpp:1.3
netpanzer/src/Lib/cTimeStamp.cpp:1.4
--- netpanzer/src/Lib/cTimeStamp.cpp:1.3 Fri Sep 5 22:01:17 2003
+++ netpanzer/src/Lib/cTimeStamp.cpp Sat Sep 6 06:34:28 2003
@@ -21,14 +21,25 @@
#include <assert.h>
#include "cTimeStamp.hpp"
+// the nicely simple SDL version:
+#ifdef USE_SDL
+void TIMESTAMP::calibrate()
+{ }
+TIMESTAMP now()
+{
+ return TIMESTAMP(SDL_GetTicks());
+}
+
+#endif
+
+// XXX remove this mess when the SDL version is tested enough
+#ifdef WIN32
//***************************************************************************
// local data
//***************************************************************************
-bool gTimeSliceFlag = false;
-
float timeElapsed;
static bool calibrated = false;
static long double ticksPerClock;
@@ -78,20 +89,17 @@
// global code
//***************************************************************************
-#if 1
// Old version
//---------------------------------------------------------------------------
TIMESTAMP now() {
if (!calibrated) TIMESTAMP::calibrate();
return TIMESTAMP(long( WinTimer::GetClock() * ticksPerClock));
}
-#endif
//***************************************************************************
// class TIMESTAMP member functions
//***************************************************************************
-#if 1
// Old version
//---------------------------------------------------------------------------
void TIMESTAMP::calibrate() {
Index: netpanzer/src/Lib/cTimeStamp.hpp
diff -u netpanzer/src/Lib/cTimeStamp.hpp:1.2
netpanzer/src/Lib/cTimeStamp.hpp:1.3
--- netpanzer/src/Lib/cTimeStamp.hpp:1.2 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/Lib/cTimeStamp.hpp Sat Sep 6 06:34:28 2003
@@ -18,7 +18,12 @@
#ifndef __cTimeStamp_hpp__
#define __cTimeStamp_hpp__
+#ifdef USE_SDL
+#include <SDL.h>
+#endif
+#ifdef WIN32
#include "WinTimer.hpp"
+#endif
////---------------------------------------------------------------------------
//// class TIMESTAMP defines a way to record a point in time. The actual value
@@ -31,52 +36,56 @@
//// use RTDSC, so it's as accurate as RESOLUTION.
class TIMESTAMP {
private:
- // RESOLUTION defines the number of ticks that equal one second, but
this
- // doesn't necessarily mean that a timestamp is accurate to the nearest
- // RESOLTUIONth of a second
- // enum { RESOLUTION = 2500UL };
-
- unsigned long v; // tick count (actual value is meaningless, only for
relative comparisons)
-
- inline static double ticksToSecs(long t) { return double(t) *
(1.0/WinTimer::TimerFrequency); }
- inline static long secsToTicks(float s) { return long(s *
float(WinTimer::TimerFrequency)); }
+#ifdef WIN32
+ typedef unsigned long Ticks;
+#endif
+#ifdef USE_SDL
+ typedef Uint32 Ticks;
+#endif
+ Ticks v; // ticks count
+
+ inline static double ticksToSecs(Ticks t)
+ { return double(t) / 1000.0; }
+ inline static long secsToTicks(float s)
+ { return (Ticks) (s * 1000.0); }
public:
- inline TIMESTAMP(unsigned long nV) { v = nV; }
-
-
- inline TIMESTAMP() {}
- inline TIMESTAMP(const TIMESTAMP &a) { v = a.v; }
-
- inline TIMESTAMP &operator =(const TIMESTAMP &a) { v = a.v; return
*this; }
-
- inline TIMESTAMP &operator +=(float seconds) { v +=
secsToTicks(seconds); return *this; }
- inline TIMESTAMP &operator -=(float seconds) { v -=
secsToTicks(seconds); return *this; }
-
- inline TIMESTAMP operator +(float seconds) const { return TIMESTAMP(v
+ secsToTicks(seconds)); }
- inline TIMESTAMP operator -(float seconds) const { return TIMESTAMP(v
- secsToTicks(seconds)); }
-
- inline double operator -(const TIMESTAMP &a) const { return
ticksToSecs(long(v - a.v)); }
-
- inline int operator < (const TIMESTAMP &a) const { return long(v -
a.v) < 0L; }
- inline int operator <=(const TIMESTAMP &a) const { return long(v -
a.v) <= 0L; }
- inline int operator >=(const TIMESTAMP &a) const { return long(v -
a.v) >= 0L; }
- inline int operator > (const TIMESTAMP &a) const { return long(v -
a.v) > 0L; }
- inline int operator ==(const TIMESTAMP &a) const { return v ==
a.v; }
+ TIMESTAMP(Ticks nV = 0)
+ { v = nV; }
+ TIMESTAMP(const TIMESTAMP& other)
+ { v = other.v; }
+
+ TIMESTAMP &operator =(const TIMESTAMP& other)
+ { v = other.v; return *this; }
+
+ TIMESTAMP &operator +=(float seconds)
+ { v += secsToTicks(seconds); return *this; }
+ TIMESTAMP &operator -=(float seconds)
+ { v -= secsToTicks(seconds); return *this; }
+
+ TIMESTAMP operator +(float seconds) const
+ { return TIMESTAMP(v + secsToTicks(seconds)); }
+ TIMESTAMP operator -(float seconds) const
+ { return TIMESTAMP(v - secsToTicks(seconds)); }
+
+ double operator -(const TIMESTAMP &a) const
+ { return ticksToSecs(long(v - a.v)); }
+ int operator < (const TIMESTAMP &a) const
+ { return long(v - a.v) < 0L; }
+ int operator <=(const TIMESTAMP &a) const
+ { return long(v - a.v) <= 0L; }
+ int operator >=(const TIMESTAMP &a) const
+ { return long(v - a.v) >= 0L; }
+ int operator > (const TIMESTAMP &a) const
+ { return long(v - a.v) > 0L; }
+ int operator ==(const TIMESTAMP &a) const
+ { return v == a.v; }
// calibrate the timestamp system for this computer
static void calibrate();
};
-//***************************************************************************
-// global functions
-//***************************************************************************
-
// Return the current timestamp
extern TIMESTAMP now();
-
-//***************************************************************************
-// end
-//***************************************************************************
#endif // #ifndef __cTimeStamp_hpp__
Index: netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.3
netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/BonusUnitPowerUp.cpp Sat Sep 6
06:34:28 2003
@@ -30,7 +30,7 @@
#include "UnitNetMessage.hpp"
#include "PowerUpNetMessage.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
SpritePacked BONUS_POWERUP_ANIM;
@@ -58,7 +58,7 @@
PlayerID player_id;
PointXYi map_loc;
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
unit = UnitInterface::getUnit( unit_id );
@@ -138,7 +138,7 @@
{
PlayerID local_player_id;
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
powerup_state.life_cycle_state = _power_up_lifecycle_state_inactive;
local_player_id = PlayerInterface::getLocalPlayerID();
Index: netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.3
netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp:1.3 Fri Sep 5
22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/EnemyRadarPowerUp.cpp Sat Sep 6
06:34:28 2003
@@ -31,7 +31,7 @@
#include "UnitNetMessage.hpp"
#include "PowerUpNetMessage.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
SpritePacked ENEMY_RADAR_POWERUP_ANIM;
@@ -55,7 +55,7 @@
UnitBase *unit;
PlayerID player_id;
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
unit = UnitInterface::getUnit( unit_id );
@@ -106,7 +106,7 @@
void EnemyRadarPowerUp::onHit( PowerUpHitMesg *message )
{
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
PlayerID local_player_id;
local_player_id = PlayerInterface::getLocalPlayerID();
Index: netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp
diff -u netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.3
netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp:1.3 Fri Sep 5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/UnitPowerUp.cpp Sat Sep 6 06:34:28 2003
@@ -34,7 +34,7 @@
//#include "lua.h"
-#include "DSound.hpp"
+#include "Sound.hpp"
enum { _unit_powerup_hitpoints,
@@ -163,7 +163,7 @@
UnitBase *unit;
PlayerID player_id;
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
unit = UnitInterface::getUnit( unit_id );
@@ -276,7 +276,7 @@
{
PlayerID local_player_id;
- dsound.PlayPowerUpSound();
+ sound->PlayPowerUpSound();
powerup_state.life_cycle_state = _power_up_lifecycle_state_inactive;
local_player_id = PlayerInterface::getLocalPlayerID();
Index: netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.3
netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/BulletWeapon.cpp Sat Sep 6
06:34:29 2003
@@ -23,7 +23,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
@@ -87,8 +87,8 @@
lifecycle_status = _lifecycle_weapon_in_active;
//SFX
- dsound.PlayAmbientSound( _not_applicable,
- _hit_target,
+ sound->PlayAmbientSound( _not_applicable,
+
Sound::_hit_target,
WorldViewInterface::getCameraDistance( location ) );
// ** Particle Shit
Index: netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.3
netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/MissleWeapon.cpp Sat Sep 6
06:34:29 2003
@@ -23,7 +23,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
#include "Math.hpp"
@@ -135,8 +135,8 @@
lifecycle_status = _lifecycle_weapon_in_active;
//SFX
- dsound.PlayAmbientSound( _not_applicable,
- _hit_target,
+ sound->PlayAmbientSound( _not_applicable,
+
Sound::_hit_target,
WorldViewInterface::getCameraDistance( location ) );
// ** Particle Shit
Index: netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.3
netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/ShellWeapon.cpp Sat Sep 6
06:34:29 2003
@@ -23,7 +23,7 @@
#include "StaticsInterface.hpp"
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "Particle2D.hpp"
#include "WeaponGlobals.hpp"
#include "ParticleInterface.hpp"
@@ -109,8 +109,8 @@
lifecycle_status = _lifecycle_weapon_in_active;
//SFX
- dsound.PlayAmbientSound( _not_applicable,
- _hit_target,
+ sound->PlayAmbientSound( _not_applicable,
+
Sound::_hit_target,
WorldViewInterface::getCameraDistance( location ) );
// ** Particle Shit
Index: netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp
diff -u netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.3
netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.4
--- netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Classes/Weapons/Weapon.cpp Sat Sep 6 06:34:29 2003
@@ -28,7 +28,7 @@
#include "WorldViewInterface.hpp"
#include "DDHardSurface.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "ParticleInterface.hpp"
#include "WeaponGlobals.hpp"
#include "Math.hpp"
@@ -201,7 +201,7 @@
lifecycle_status = _lifecycle_weapon_in_active;
//SFX
- dsound.PlayAmbientSound( _not_applicable, _hit_target, 0 );
+ sound->PlayAmbientSound( _not_applicable, Sound::_hit_target, 0 );
// ** Particle Shit
iXY loc = iXY( location.x, location.y );
Index: netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp
diff -u netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.5
netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.6
--- netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp:1.5 Fri Sep
5 22:01:18 2003
+++ netpanzer/src/NetPanzer/Classes/WorldInputCmdProcessor.cpp Sat Sep 6
06:34:28 2003
@@ -36,7 +36,7 @@
#include "Client.hpp"
#include "NetMessageEncoder.hpp"
#include "PlacementMatrix.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "GameConfig.hpp"
@@ -186,13 +186,15 @@
if ( unit_loc_status == _unit_player )
{ return( _cursor_player_unit ); }
else
- if ( (unit_loc_status == _unit_enemy) && KeyboardInterface::getKeyState(
SDLK_A ) )
+ if ( (unit_loc_status == _unit_enemy) && KeyboardInterface::getKeyState(
+ SDLK_a ) )
{ return ( _cursor_make_allie ); }
else
if ( (unit_loc_status == _unit_enemy) && working_list.isSelected() )
{ return ( _cursor_enemy_unit ); }
else
- if ( (unit_loc_status == _unit_allied) && KeyboardInterface::getKeyState(
SDLK_A ) )
+ if ( (unit_loc_status == _unit_allied) && KeyboardInterface::getKeyState(
+ SDLK_a ) )
{ return ( _cursor_break_allie ); }
if ( working_list.isSelected() )
@@ -262,8 +264,8 @@
void WorldInputCmdProcessor::getManualControlStatus( void )
{
- if ( KeyboardInterface::getKeyState( SDLK_LCRTL ) ||
- KeyboardInterface::getKeyState( SDLK_RCRTL )
+ if ( KeyboardInterface::getKeyState( SDLK_LCTRL ) ||
+ KeyboardInterface::getKeyState( SDLK_RCTRL )
)
{
manual_fire_state = true;
@@ -277,20 +279,21 @@
void WorldInputCmdProcessor::evaluateKeyCommands( void )
{
- //if ( (KeyboardInterface::getKeyPressed( SDLK_U ) == true) )
+ //if ( (KeyboardInterface::getKeyPressed( SDLK_u ) == true) )
// { cycleNextUnitAndChangeFocus(); }
- if ( (KeyboardInterface::getKeyPressed( SDLK_O ) == true) )
+ if ( (KeyboardInterface::getKeyPressed( SDLK_o ) == true) )
{ toggleDisplayOutpostNames(); }
- if ( (KeyboardInterface::getKeyPressed( SDLK_F ) == true) )
+ if ( (KeyboardInterface::getKeyPressed( SDLK_f ) == true) )
{ toggleUnitFlagVisibility(); }
- if ( (KeyboardInterface::getKeyPressed( SDLK_ENTER ) == true) )
+ if ( (KeyboardInterface::getKeyPressed( SDLK_RETURN ) == true) )
{ setKeyboardInputModeChatMesg(); }
- if ( ( KeyboardInterface::getKeyState( SDLK_LCRTL ) ||
KeyboardInterface::getKeyState( SDLK_RCRTL ) )
- && (KeyboardInterface::getKeyPressed( SDLK_A ) == true) )
+ if ( ( KeyboardInterface::getKeyState( SDLK_LCTRL ) ||
+ KeyboardInterface::getKeyState( SDLK_RCTRL ) )
+ && (KeyboardInterface::getKeyPressed( SDLK_a ) == true) )
{ setKeyboardInputModeAllieChatMesg(); }
}
@@ -640,8 +643,8 @@
unsigned char click_status;
if ( (manual_control_state == true) ||
- KeyboardInterface::getKeyState( SDLK_LCRTL ) ||
- KeyboardInterface::getKeyState( SDLK_RCRTL )
+ KeyboardInterface::getKeyState( SDLK_LCTRL ) ||
+ KeyboardInterface::getKeyState( SDLK_RCTRL )
)
{
@@ -686,7 +689,8 @@
current_selection_list_index = 0xFFFF;
if ( working_list.unit_list.containsItems() > 0 )
{
- dsound.PlayUnitVoice( working_list.getHeadUnitType(), _selected);
+ sound->PlayUnitVoice( working_list.getHeadUnitType(),
+
Sound::_selected);
}
} break;
@@ -732,7 +736,8 @@
if (event.event == MouseEvent::EVENT_CLICK )
{
- if ( (KeyboardInterface::getKeyState(SDLK_LCRTL) ||
KeyboardInterface::getKeyState(SDLK_RCRTL) ) )
+ if ( (KeyboardInterface::getKeyState(SDLK_LCTRL) ||
+ KeyboardInterface::getKeyState(SDLK_RCTRL) ) )
{
WorldViewInterface::clientXYtoWorldXY( world_win, event.down_pos,
&world_pos );
player_id = PlayerInterface::getLocalPlayerID();
@@ -824,8 +829,8 @@
} // ** if
//sfx
- dsound.PlayUnitSound(working_list.getHeadUnitType() );
- dsound.PlayUnitVoice(working_list.getHeadUnitType(), _move_to);
+ sound->PlayUnitSound(working_list.getHeadUnitType() );
+ sound->PlayUnitVoice(working_list.getHeadUnitType(), Sound::_move_to);
}
void WorldInputCmdProcessor::sendAttackCommand( PointXYi &world_pos )
@@ -880,7 +885,7 @@
} // ** if
//sfx
- dsound.PlayUnitVoice(working_list.getHeadUnitType(), _target_enemy);
+ sound->PlayUnitVoice(working_list.getHeadUnitType(), Sound::_target_enemy);
} // ** if
}
@@ -972,7 +977,7 @@
CLIENT->sendMessage( encode_message, encode_message->realSize(), 0 );
} // ** if
// SFX
- dsound.PlayUnitVoice(working_list.getHeadUnitType(), _target_enemy);
+ sound->PlayUnitVoice(working_list.getHeadUnitType(), Sound::_target_enemy);
} // ** if containsItems() > 0
}
@@ -1032,7 +1037,7 @@
if (KeyboardInterface::getChar(&key_char))
{
ConsoleInterface::addExtendedChar(key_char);
- if ((key_char == SDLK_ENTER) )
+ if ((key_char == SDLK_RETURN) )
{
enter_key_hit_count++;
if (enter_key_hit_count == 2)
Index: netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.5
netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.6
--- netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp:1.5 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/ConsoleInterface.cpp Sat Sep 6
06:34:29 2003
@@ -366,7 +366,7 @@
// Process the extendedChar accordingly.
switch (newExtendedChar)
{
- case SDLK_ENTER:
+ case SDLK_RETURN:
{
} break;
Index: netpanzer/src/NetPanzer/Interfaces/GameManager.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.9
netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.10
--- netpanzer/src/NetPanzer/Interfaces/GameManager.cpp:1.9 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/GameManager.cpp Sat Sep 6 06:34:29 2003
@@ -672,15 +672,16 @@
}
}
- if( (KeyboardInterface::getKeyState( SDLK_LCRTL) ||
KeyboardInterface::getKeyState( SDLK_RCRTL) ) )
+ if( (KeyboardInterface::getKeyState( SDLK_LCTRL) ||
+ KeyboardInterface::getKeyState( SDLK_RCTRL) ) )
{
// DEBUG VIEW
- if ( KeyboardInterface::getKeyPressed( SDLK_F ) )
+ if ( KeyboardInterface::getKeyPressed( SDLK_f ) )
{ display_frame_rate_flag = !display_frame_rate_flag; }
// DEBUG VIEW
- if ( KeyboardInterface::getKeyPressed( SDLK_N ) )
+ if ( KeyboardInterface::getKeyPressed( SDLK_n ) )
{ display_network_info_flag = !display_network_info_flag; }
}
Index: netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp:1.3 Fri Sep 5
21:09:50 2003
+++ netpanzer/src/NetPanzer/Interfaces/MouseInterface.cpp Sat Sep 6
06:34:29 2003
@@ -375,8 +375,8 @@
#ifdef USE_SDL
int x, y;
SDL_GetMouseState(&x, &y);
- mouse_pox.x = x;
- mouse_pox.y = y;
+ mouse_pos.x = x;
+ mouse_pos.y = y;
#endif
}
Index: netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/ProjectileInterface.cpp Sat Sep 6
06:34:29 2003
@@ -18,7 +18,7 @@
#include <config.h>
#include "ProjectileInterface.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "ParticleInterface.hpp"
#include "MissleWeapon.hpp"
@@ -191,8 +191,8 @@
//SFX
long distance = WorldViewInterface::getCameraDistance( start );
- dsound.PlayAmbientSound( owner_type_id, _fire_gun, distance );
- dsound.PlayAmbientSound( _not_applicable, _random_battle, distance );
+ sound->PlayAmbientSound( owner_type_id, Sound::_fire_gun, distance );
+ sound->PlayAmbientSound( _not_applicable, Sound::_random_battle, distance );
}
Index: netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp
diff -u netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.3
netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.4
--- netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Interfaces/UnitInterface.cpp Sat Sep 6
06:34:29 2003
@@ -42,7 +42,7 @@
#include "UnitMessageTypes.hpp"
#include "PlayerNetMessage.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "ParticleInterface.hpp"
@@ -207,8 +207,8 @@
ParticleInterface::addHit(unit->unit_state);
//SFX
- dsound.PlayAmbientSound( _not_applicable,
- _blow_up_tank,
+ sound->PlayAmbientSound( _not_applicable,
+
Sound::_blow_up_tank,
WorldViewInterface::getCameraDistance( unit->unit_state.location ) );
deleteUnit( unit );
@@ -1035,8 +1035,8 @@
ParticleInterface::addHit(unit->unit_state);
//SFX
- dsound.PlayAmbientSound( _not_applicable,
- _blow_up_tank,
+ sound->PlayAmbientSound( _not_applicable,
+ Sound::_blow_up_tank,
WorldViewInterface::getCameraDistance( unit->unit_state.location ) );
unit_lists[ unit_id.getPlayer() ].deleteUnit( unit_id );
Index: netpanzer/src/NetPanzer/Port/Wrldsprt.cpp
diff -u netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.3
netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.4
--- netpanzer/src/NetPanzer/Port/Wrldsprt.cpp:1.3 Fri Sep 5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Port/Wrldsprt.cpp Sat Sep 6 06:34:29 2003
@@ -20,6 +20,7 @@
#include "DirectDrawGlobals.hpp"
#include "Wrldsprt.hpp"
#include "blitters.h"
+#include "UIDraw.hpp"
#include "WorldViewInterface.hpp"
@@ -129,11 +130,11 @@
frame_offset = ((y - (view_start_y)) * DBUFFER_WIDTH) + (x - (view_start_x))
+ OFFSET_TO_VIEW;
- DDraw.lockDoubleBuffer( &double_buffer );
+ Screen->lockDoubleBuffer( &double_buffer );
general_blitter( sprite->x_size, sprite->y_size, frame_offset, sprite->data,
double_buffer );
- DDraw.unlockDoubleBuffer();
+ Screen->unlockDoubleBuffer();
if (select_flag)
{
@@ -297,7 +298,7 @@
frame_data = anim->data + (anim->frame_size * frame_counter) + (direct *
anim->direct_size);
- DDraw.lockDoubleBuffer( &double_buffer );
+ Screen->lockDoubleBuffer( &double_buffer );
general_blitter( anim->x_size, anim->y_size, frame_offset, frame_data,
double_buffer );
@@ -314,7 +315,7 @@
blit_selector_square( x_size, y_size, frame_offset, double_buffer );
}
- DDraw.unlockDoubleBuffer();
+ Screen->unlockDoubleBuffer();
}
}
Index: netpanzer/src/NetPanzer/Structs/KeyScanCodeDefs.h
diff -u netpanzer/src/NetPanzer/Structs/KeyScanCodeDefs.h:1.2
netpanzer/src/NetPanzer/Structs/KeyScanCodeDefs.h:1.3
--- netpanzer/src/NetPanzer/Structs/KeyScanCodeDefs.h:1.2 Fri Sep 5
21:44:45 2003
+++ netpanzer/src/NetPanzer/Structs/KeyScanCodeDefs.h Sat Sep 6 06:34:29 2003
@@ -36,42 +36,42 @@
#define SDLK_EQUALS 13
#define SDLK_BACKSPACE 14
#define SDLK_TAB 15
-#define SDLK_Q 16
-#define SDLK_W 17
-#define SDLK_E 18
-#define SDLK_R 19
-#define SDLK_T 20
-#define SDLK_Y 21
-#define SDLK_U 22
-#define SDLK_I 23
-#define SDLK_O 24
-#define SDLK_P 25
+#define SDLK_q 16
+#define SDLK_w 17
+#define SDLK_e 18
+#define SDLK_r 19
+#define SDLK_t 20
+#define SDLK_y 21
+#define SDLK_u 22
+#define SDLK_i 23
+#define SDLK_o 24
+#define SDLK_p 25
#define SDLK_LEFTBRACKET 26
#define SDLK_RIGHTBRACKET 27
-#define SDLK_ENTER 28
-#define SDLK_LCRTL 29
-#define SDLK_RCRTL (0x9D)
-#define SDLK_A 30
-#define SDLK_S 31
-#define SDLK_D 32
-#define SDLK_F 33
-#define SDLK_G 34
-#define SDLK_H 35
-#define SDLK_J 36
-#define SDLK_K 37
-#define SDLK_L 38
+#define SDLK_RETURN 28
+#define SDLK_LCTRL 29
+#define SDLK_RCTRL (0x9D)
+#define SDLK_a 30
+#define SDLK_s 31
+#define SDLK_d 32
+#define SDLK_f 33
+#define SDLK_g 34
+#define SDLK_h 35
+#define SDLK_j 36
+#define SDLK_k 37
+#define SDLK_l 38
#define SDLK_SEMICOLON 39
//#define SDLK_APOS 40
//#define SDLK_TILDE 41
#define SDLK_LSHIFT 42
#define SDLK_BACKSLASH 43
-#define SDLK_Z 44
-#define SDLK_X 45
-#define SDLK_C 46
-#define SDLK_V 47
-#define SDLK_B 48
-#define SDLK_N 49
-#define SDLK_M 50
+#define SDLK_z 44
+#define SDLK_x 45
+#define SDLK_c 46
+#define SDLK_v 47
+#define SDLK_b 48
+#define SDLK_n 49
+#define SDLK_m 50
#define SDLK_COMMA 51
#define SDLK_PERIOD 52
#define SDLK_SLASH 53
Index: netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/AreYouSureResignView.cpp Sat Sep 6
06:34:29 2003
@@ -26,7 +26,7 @@
#include "ParticleSystem2D.hpp"
#include "Particle2D.hpp"
#include "MenuTemplateView.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "SoundView.hpp"
#include "ControlsView.hpp"
#include "VisualsView.hpp"
@@ -36,7 +36,7 @@
//---------------------------------------------------------------------------
static void bYES()
{
- dsound.StopTankIdle();
+ sound->StopTankIdle();
GameManager::drawTextCenteredOnScreen("Loading Main View...",
Color::white);
Index: netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/HelpScrollView.cpp Sat Sep 6
06:34:29 2003
@@ -20,7 +20,6 @@
#include <config.h>
#include "HelpScrollView.hpp"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
Index: netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.5
netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.6
--- netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp:1.5 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/MiniMapView.cpp Sat Sep 6 06:34:29 2003
@@ -491,8 +491,8 @@
{
// If units are selected, send the units there and deselect the
units.
// If there is a unit selected, see if we should move a
unit there.
- if ( (KeyboardInterface::getKeyState(SDLK_LCRTL) ||
- KeyboardInterface::getKeyState(SDLK_RCRTL)))
+ if ( (KeyboardInterface::getKeyState(SDLK_LCTRL) ||
+ KeyboardInterface::getKeyState(SDLK_RCTRL)))
{
if (MiniMapInterface::isUnitSelected())
{
@@ -514,8 +514,8 @@
{
if
(getClientRect().contains(getScreenToClientPos(mouse.getScreenPos())))
{
- if ( (KeyboardInterface::getKeyState(SDLK_LCRTL) ||
- KeyboardInterface::getKeyState(SDLK_RCRTL)))
+ if ( (KeyboardInterface::getKeyState(SDLK_LCTRL) ||
+ KeyboardInterface::getKeyState(SDLK_RCTRL)))
{
// Set the cursor accordinly.
if (MiniMapInterface::isUnitSelected())
Index: netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp
diff -u netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.3
netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp:1.3 Fri Sep 5
22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/Game/WinnerMesgView.cpp Sat Sep 6
06:34:29 2003
@@ -20,7 +20,7 @@
#include "GameViewGlobals.hpp"
#include "Desktop.hpp"
#include "Stats.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "DDHardSurface.hpp"
#include "DirectDrawGlobals.hpp"
#include "ParticleSystem2D.hpp"
@@ -45,7 +45,7 @@
}
else
{
- dsound.StopTankIdle();
+ sound->StopTankIdle();
// Blank the screen.
Index: netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp:1.3 Fri Sep
5 22:01:19 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/MenuTemplateView.cpp Sat Sep 6
06:34:29 2003
@@ -22,7 +22,7 @@
#include "Desktop.hpp"
#include "GameConfig.hpp"
#include "GameManager.hpp"
-#include "DSound.hpp"
+#include "Sound.hpp"
#include "cMouse.hpp"
#include "ViewGlobals.hpp"
#include "DirectDrawGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/FlagSelectionView.cpp Sat Sep
6 06:34:29 2003
@@ -20,7 +20,6 @@
#include <config.h>
#include "FlagSelectionView.hpp"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionHostView.cpp Sat Sep
6 06:34:29 2003
@@ -22,7 +22,6 @@
#include "Desktop.hpp"
#include "DirectPlay.h"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "TimerInterface.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/GetSessionView.cpp Sat Sep
6 06:34:29 2003
@@ -25,7 +25,6 @@
#include "GameManager.hpp"
#include "DirectPlay.h"
#include "DirectDrawGlobals.hpp"
-#include "DSound.hpp"
#include "gapp.hpp"
#include "MouseInterface.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
diff -u
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostJoinTemplateView.cpp
Sat Sep 6 06:34:29 2003
@@ -24,7 +24,6 @@
#include "GameManager.hpp"
#include "DirectPlay.h"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "DirectDrawGlobals.hpp"
#include "DDHardSurface.hpp"
#include "FontSystem2D.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/HostView.cpp Sat Sep 6
06:34:29 2003
@@ -18,7 +18,6 @@
#include <config.h>
#include "HostView.hpp"
#include "GameConfig.hpp"
-#include "DSound.hpp"
#include "GameViewGlobals.hpp"
#include "ParticleSystemGlobals.hpp"
#include "HostOptionsView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/JoinView.cpp Sat Sep 6
06:34:29 2003
@@ -22,8 +22,6 @@
#include "GameManager.hpp"
#include "DirectPlay.h"
#include "gapp.hpp"
-#include "DSound.hpp"
-#include "DirectDrawGlobals.hpp"
#include "GameManager.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/MapSelectionView.cpp Sat Sep
6 06:34:29 2003
@@ -15,13 +15,12 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifdef WIN32
#include <config.h>
+#ifdef WIN32
#include <io.h>
#endif
#include "MapSelectionView.hpp"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "GameConfig.hpp"
#include "GameViewGlobals.hpp"
#include "HostOptionsView.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp:1.3 Fri Sep
5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitColorView.cpp Sat Sep
6 06:34:29 2003
@@ -18,7 +18,6 @@
#include <config.h>
#include "UnitColorView.hpp"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
#include "ColorTable.hpp"
Index: netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp
diff -u netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.3
netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.4
--- netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp:1.3
Fri Sep 5 22:01:20 2003
+++ netpanzer/src/NetPanzer/Views/MainMenu/Multi/UnitSelectionView.cpp Sat Sep
6 06:34:29 2003
@@ -18,7 +18,6 @@
#include <config.h>
#include "UnitSelectionView.hpp"
#include "gapp.hpp"
-#include "DSound.hpp"
#include "GameView.hpp"
#include "GameViewGlobals.hpp"
Index: netpanzer/src/config.h
diff -u netpanzer/src/config.h:1.1 netpanzer/src/config.h:1.2
--- netpanzer/src/config.h:1.1 Mon Sep 1 16:24:18 2003
+++ netpanzer/src/config.h Sat Sep 6 06:34:27 2003
@@ -4,4 +4,4 @@
#define __attrib__(x)
#endif
-//#define USE_SDL
+#define USE_SDL
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [netPanzer-CVS] netpanzer/src config.h DirectX/DirectSound/DSou...,
Matthias Braun <=