-most camera controllers use mouseScale value, made a bunch of camera movement actions dependent on mouseScale.

-Fixed sound playing in windows (it stopped after maxSounds were played). I'm not sure why it didn't work in the first place though.
-Added CR_ENUM_MEMBER macro for member values with an enumerated type.


git-svn-id: https://spring.clan-sy.com/svn/spring/trunk@551 37977431-3df6-0310-b722-df95706aa16b

Author: jcnossen

rts/Game/CameraController.cpp

@@ -18,6 +18,7 @@ extern Uint8 *keys;
 
 CCameraController::CCameraController(void)
 {
+	mouseScale = atof(configHandler.GetString("FPSMouseScale", DEFAULT_MOUSE_SCALE).c_str());
 }
 
 CCameraController::~CCameraController(void)
@@ -31,7 +32,6 @@ CCameraController::~CCameraController(void)
 CFPSController::CFPSController()
 : pos(2000,70,1800)
 {
-	mouseScale = atof(configHandler.GetString("FPSMouseScale", DEFAULT_MOUSE_SCALE).c_str());
 }
 
 void CFPSController::KeyMove(float3 move)
@@ -124,7 +124,7 @@ void COverheadController::KeyMove(float3 move)
 
 void COverheadController::MouseMove(float3 move)
 {
-	float pixelsize=tan(camera->fov/180/2*PI)*2/gu->screeny*height*2;
+	float pixelsize=100*mouseScale*tan(camera->fov/180/2*PI)*2/gu->screeny*height*2;
 	pos.x+=move.x*pixelsize*(1+keys[SDLK_LSHIFT]*3);	
 	pos.z+=move.y*pixelsize*(1+keys[SDLK_LSHIFT]*3);
 }
@@ -137,11 +137,11 @@ void COverheadController::ScreenEdgeMove(float3 move)
 void COverheadController::MouseWheelMove(float move)
 {
 	if (keys[SDLK_LCTRL]) {
-		zscale *= 1+move*0.002;
+		zscale *= 1+move * mouseScale;
 		if (zscale < 0.05) zscale = 0.05f;
 		if (zscale > 10) zscale = 10;
 	} else
-		height*=1+move*0.001;
+		height*=1+move * mouseScale*0.7;
 }
 
 float3 COverheadController::GetPos()

rts/Game/CameraController.h

@@ -18,6 +18,8 @@ class CCameraController
 	virtual void SetPos(float3 newPos)=0;
 	virtual float3 SwitchFrom()=0;			//return pos that to send to new controllers SetPos
 	virtual void SwitchTo()=0;
+	
+	float mouseScale;
 };
 
 class CFPSController : public CCameraController
@@ -41,8 +43,6 @@ class CFPSController : public CCameraController
 	float oldHeight;
 
 	float3 dir;
-
-	float mouseScale;
 };
 
 class COverheadController : public CCameraController
@@ -109,8 +109,6 @@ class CRotOverheadController : public CCameraController
 	float oldHeight;
 
 	float3 dir;
-
-	float mouseScale;
 };
 
 #endif // __CAMERA_CONTROLLER_H__

rts/Sim/Misc/Feature.cpp

@@ -74,6 +74,7 @@ void CFeature::Initialize (const float3& pos,FeatureDef* def,short int heading,i
 {
 	this->def=def;
 	createdFromUnit=fromUnit;
+	this->pos=pos;
 	this->allyteam=allyteam;
 	this->pos.CheckInBounds();
 	this->heading=heading;

rts/Sim/Units/COB/CobInstance.cpp

@@ -954,15 +954,6 @@ void CCobInstance::SetUnitVal(int val, int param)
 	case VETERAN_LEVEL: 
 		unit->experience=param*0.01f;
 		break;
-	case CURRENT_SPEED:
-		if (param==0) 
-			unit->speed=ZeroVector;
-		else {
-			float cur=unit->speed.SqLength();
-			if (cur>0.001)
-				unit->speed *= (param*(1.0f/SCALE))/sqrtf(cur); // calculate by what value the speed should be multiplied with to get it to length=param/SCALE
-		}
-		break;
 	}
 #endif
 }

rts/System/Sound.cpp

@@ -39,15 +39,19 @@ CSound::CSound()
 		noSound = true;
 		return;
 	}
+
+	// Generate sound sources
 	Sources = new ALuint[maxSounds];
+	for (int a=0;a<maxSounds;a++) Sources[a]=0;
 }
 
 CSound::~CSound()
 {
 	LoadedFiles.clear();
-	alDeleteSources(maxSounds,Sources);
-	if (!noSound)
+	if (!noSound) {
+		alDeleteSources(maxSounds,Sources);
 		delete[] Sources;
+	}
 	for (std::vector<ALuint>::iterator it = Buffers.begin(); it != Buffers.end(); it++)
 		alDeleteBuffers(1,&(*it));
 	Buffers.clear();
@@ -78,28 +82,43 @@ void CSound::PlaySound(int id,const float3& p,float volume)
 		return;
 	ALuint source;
 	alGenSources(1,&source);
+
+	if (alGetError() != AL_NO_ERROR) {
+		(*info) << "error generating OpenAL sound source";
+        return;
+	}
+
+	if (Sources[cur])
+		alDeleteSources(1,&Sources[cur]);
+	Sources[cur++] = source;
+	if (cur == maxSounds)
+		cur = 0;
+
 	alSourcei(source, AL_BUFFER, id);
 	alSourcef(source, AL_PITCH, 1.0f );
 	alSourcef(source, AL_GAIN, volume );
 	alSource3f(source, AL_POSITION, p.x/(gs->mapx*SQUARE_SIZE),p.y/(gs->mapy*SQUARE_SIZE),p.z/(p.maxzpos));
 	alSource3f(source, AL_VELOCITY, 0.0f,0.0f,0.0f);
 	alSourcei(source, AL_LOOPING, false);
-	Enqueue(source);
 	alSourcePlay(source);
 }
 
-void CSound::Enqueue(ALuint src)
-{
-	alDeleteSources(1,&Sources[cur]);
-	Sources[cur++] = src;
-	if (cur == maxSounds)
-		cur = 0;
-}
-
 void CSound::Update()
 {
 	if (noSound)
 		return;
+
+	for (int a=0;a<maxSounds;a++) {
+		if (Sources[a]) {
+			ALint state;
+			alGetSourcei(Sources[a],AL_SOURCE_STATE, &state);
+			if (state == AL_STOPPED) {
+				alDeleteSources(1,&Sources[a]);
+				Sources[a]=0;
+			}
+		}
+	}
+
 	UpdateListener();
 }
 

rts/System/creg/ClassReg.h

@@ -94,6 +94,8 @@ namespace creg {
 	// Macro to register a member within the CR_BIND_MEMBERS macro - the offset is a bit weird to prevent compiler warnings
 #define CR_MEMBER(Member)	\
 	class_->AddMember ( #Member, creg::GetType (null->Member), (unsigned int)(((char*)&null->Member)-((char*)0)))
+#define CR_ENUM_MEMBER(Member) \
+	class_->AddMember ( #Member, IType::CreateEnumeratedType(sizeof(null->Member)), (unsigned int)(((char*)&null->Member)-((char*)0)))
 
 	// Base object class - all objects should derive from this if they should be referencable by pointers 
 	class Object
@@ -152,6 +154,7 @@ namespace creg {
 		static IType* CreateStringType ();
 		static IType* CreatePointerToObjType (Class *objectType);
 		static IType* CreateStaticArrayType (IType *elemType, unsigned int size);
+		static IType* CreateEnumeratedType (size_t size);
 	};
 
 	struct Iterator; // Undefined Iterator struct to denote a container iterator

rts/System/creg/VarTypes.cpp

@@ -29,6 +29,16 @@ IType* IType::CreateStaticArrayType (IType *elemType, unsigned int size)
 	return new StaticArrayType (elemType, size);
 }
 
+IType* IType::CreateEnumeratedType (size_t size)
+{
+	switch (size) {
+		case 1: return new BasicType (crUChar);
+		case 2: return new BasicType (crUShort);
+		case 4: return new BasicType (crUInt);
+	}
+	return 0;
+}
+
 
 // container type