Fixed bug in Control Menu code relative to Joystick name.

viewizard · viewizard · commit 4980c0f622bb · 2013-06-19T13:42:47.000Z
diff --git a/AstroMenaceSource/Game.h b/AstroMenaceSource/Game.h
@@ -391,7 +391,7 @@ extern float But[10];
 
 void ConfControlMenu(float ContentTransp, float *ButtonTransp1, float *LastButtonUpdateTime1);
 const char * MouseCodeName(char Num);
-const char * JoystickCodeName(char Num);
+const char * JoystickCodeName(int Num);
 void CheckMouseKeybJState();
 
 
diff --git a/AstroMenaceSource/Menu/Menu_ConfControl.cpp b/AstroMenaceSource/Menu/Menu_ConfControl.cpp
@@ -85,7 +85,7 @@ const char * MouseCodeName(char Num)
 
 
 char JoystickCodeNameText[12];/*"JoystickXXX"*/
-const char * JoystickCodeName(char Num)
+const char * JoystickCodeName(int Num)
 {
 	// кнопки еще нет
 	if (Num == -1) return "?";
diff --git a/AstroMenaceSource/config.h b/AstroMenaceSource/config.h
@@ -29,7 +29,7 @@
 #define CONFIG_H
 
 #define GAME_VERSION	 	"1.3.2 svn"
-#define GAME_BUILD			130610
+#define GAME_BUILD			130619
 
 
 // VBO OpenGL extention support switcher (if defined - game will detect and use VBO) Game could crash

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ const char * MouseCodeName(char Num)`
`85`	`85`
`86`	`86`
`87`	`87`	`char JoystickCodeNameText[12];/"JoystickXXX"/`
`88`		`-const char * JoystickCodeName(char Num)`
	`88`	`+const char * JoystickCodeName(int Num)`
`89`	`89`	`{`
`90`	`90`	`// кнопки еще нет`
`91`	`91`	`if (Num == -1) return "?";`