From cc172312e5d8415049461c92aa3dbbf52233e84e Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 9 Jun 2014 00:07:42 +0300
Subject: [PATCH] OpenTyrian: renamed all .cpp files back to .c, for easier
 marging

---
 .../opentyrian/src/{animlib.cpp => animlib.c} |  0
 .../src/{arg_parse.cpp => arg_parse.c}        |  0
 .../src/{backgrnd.cpp => backgrnd.c}          |  0
 .../opentyrian/src/{cJSON.cpp => cJSON.c}     |  0
 .../opentyrian/src/{config.cpp => config.c}   |  0
 .../jni/application/opentyrian/src/config.h   |  6 +--
 .../src/{destruct.cpp => destruct.c}          | 44 +++++++++----------
 .../src/{editship.cpp => editship.c}          |  0
 .../src/{episodes.cpp => episodes.c}          |  0
 .../jni/application/opentyrian/src/episodes.h | 22 +++++-----
 .../opentyrian/src/{file.cpp => file.c}       |  0
 .../src/{fm_synth.cpp => fm_synth.c}          |  0
 .../opentyrian/src/{fmopl.cpp => fmopl.c}     |  0
 .../opentyrian/src/{font.cpp => font.c}       |  0
 .../src/{fonthand.cpp => fonthand.c}          |  0
 .../src/{game_menu.cpp => game_menu.c}        |  0
 .../src/{helptext.cpp => helptext.c}          |  0
 .../src/{joystick.cpp => joystick.c}          |  0
 .../opentyrian/src/{jukebox.cpp => jukebox.c} |  0
 .../src/{keyboard.cpp => keyboard.c}          |  0
 .../src/{lds_play.cpp => lds_play.c}          |  0
 .../src/{loudness.cpp => loudness.c}          |  0
 .../opentyrian/src/{lvllib.cpp => lvllib.c}   |  0
 .../opentyrian/src/{lvlmast.cpp => lvlmast.c} |  0
 .../opentyrian/src/{mainint.cpp => mainint.c} |  0
 .../opentyrian/src/{menus.cpp => menus.c}     |  0
 .../src/{mingw_fixes.cpp => mingw_fixes.c}    |  0
 .../opentyrian/src/{mouse.cpp => mouse.c}     |  0
 .../opentyrian/src/{mtrand.cpp => mtrand.c}   |  0
 .../opentyrian/src/{musmast.cpp => musmast.c} |  0
 .../opentyrian/src/{network.cpp => network.c} |  0
 .../src/{nortsong.cpp => nortsong.c}          |  0
 .../src/{nortvars.cpp => nortvars.c}          |  0
 .../opentyrian/src/{opentyr.cpp => opentyr.c} | 14 +++---
 .../opentyrian/src/{palette.cpp => palette.c} |  0
 .../opentyrian/src/{params.cpp => params.c}   |  0
 .../opentyrian/src/{pcxload.cpp => pcxload.c} |  0
 .../opentyrian/src/{pcxmast.cpp => pcxmast.c} |  0
 .../opentyrian/src/{picload.cpp => picload.c} |  0
 .../opentyrian/src/{player.cpp => player.c}   |  0
 .../src/{scroller.cpp => scroller.c}          |  0
 .../opentyrian/src/{setup.cpp => setup.c}     |  0
 .../opentyrian/src/{sizebuf.cpp => sizebuf.c} |  0
 .../opentyrian/src/{sndmast.cpp => sndmast.c} |  0
 .../opentyrian/src/{sprite.cpp => sprite.c}   |  0
 .../opentyrian/src/{starlib.cpp => starlib.c} |  0
 .../opentyrian/src/{tyrian2.cpp => tyrian2.c} |  0
 .../opentyrian/src/{varz.cpp => varz.c}       |  0
 .../opentyrian/src/{vga256d.cpp => vga256d.c} |  0
 .../src/{vga_palette.cpp => vga_palette.c}    |  0
 .../opentyrian/src/{video.cpp => video.c}     |  0
 .../src/{video_scale.cpp => video_scale.c}    |  0
 ...ideo_scale_hqNx.cpp => video_scale_hqNx.c} |  0
 .../opentyrian/src/{xmas.cpp => xmas.c}       |  0
 54 files changed, 45 insertions(+), 41 deletions(-)
 rename project/jni/application/opentyrian/src/{animlib.cpp => animlib.c} (100%)
 rename project/jni/application/opentyrian/src/{arg_parse.cpp => arg_parse.c} (100%)
 rename project/jni/application/opentyrian/src/{backgrnd.cpp => backgrnd.c} (100%)
 rename project/jni/application/opentyrian/src/{cJSON.cpp => cJSON.c} (100%)
 rename project/jni/application/opentyrian/src/{config.cpp => config.c} (100%)
 rename project/jni/application/opentyrian/src/{destruct.cpp => destruct.c} (98%)
 rename project/jni/application/opentyrian/src/{editship.cpp => editship.c} (100%)
 rename project/jni/application/opentyrian/src/{episodes.cpp => episodes.c} (100%)
 rename project/jni/application/opentyrian/src/{file.cpp => file.c} (100%)
 rename project/jni/application/opentyrian/src/{fm_synth.cpp => fm_synth.c} (100%)
 rename project/jni/application/opentyrian/src/{fmopl.cpp => fmopl.c} (100%)
 rename project/jni/application/opentyrian/src/{font.cpp => font.c} (100%)
 rename project/jni/application/opentyrian/src/{fonthand.cpp => fonthand.c} (100%)
 rename project/jni/application/opentyrian/src/{game_menu.cpp => game_menu.c} (100%)
 rename project/jni/application/opentyrian/src/{helptext.cpp => helptext.c} (100%)
 rename project/jni/application/opentyrian/src/{joystick.cpp => joystick.c} (100%)
 rename project/jni/application/opentyrian/src/{jukebox.cpp => jukebox.c} (100%)
 rename project/jni/application/opentyrian/src/{keyboard.cpp => keyboard.c} (100%)
 rename project/jni/application/opentyrian/src/{lds_play.cpp => lds_play.c} (100%)
 rename project/jni/application/opentyrian/src/{loudness.cpp => loudness.c} (100%)
 rename project/jni/application/opentyrian/src/{lvllib.cpp => lvllib.c} (100%)
 rename project/jni/application/opentyrian/src/{lvlmast.cpp => lvlmast.c} (100%)
 rename project/jni/application/opentyrian/src/{mainint.cpp => mainint.c} (100%)
 rename project/jni/application/opentyrian/src/{menus.cpp => menus.c} (100%)
 rename project/jni/application/opentyrian/src/{mingw_fixes.cpp => mingw_fixes.c} (100%)
 rename project/jni/application/opentyrian/src/{mouse.cpp => mouse.c} (100%)
 rename project/jni/application/opentyrian/src/{mtrand.cpp => mtrand.c} (100%)
 rename project/jni/application/opentyrian/src/{musmast.cpp => musmast.c} (100%)
 rename project/jni/application/opentyrian/src/{network.cpp => network.c} (100%)
 rename project/jni/application/opentyrian/src/{nortsong.cpp => nortsong.c} (100%)
 rename project/jni/application/opentyrian/src/{nortvars.cpp => nortvars.c} (100%)
 rename project/jni/application/opentyrian/src/{opentyr.cpp => opentyr.c} (98%)
 rename project/jni/application/opentyrian/src/{palette.cpp => palette.c} (100%)
 rename project/jni/application/opentyrian/src/{params.cpp => params.c} (100%)
 rename project/jni/application/opentyrian/src/{pcxload.cpp => pcxload.c} (100%)
 rename project/jni/application/opentyrian/src/{pcxmast.cpp => pcxmast.c} (100%)
 rename project/jni/application/opentyrian/src/{picload.cpp => picload.c} (100%)
 rename project/jni/application/opentyrian/src/{player.cpp => player.c} (100%)
 rename project/jni/application/opentyrian/src/{scroller.cpp => scroller.c} (100%)
 rename project/jni/application/opentyrian/src/{setup.cpp => setup.c} (100%)
 rename project/jni/application/opentyrian/src/{sizebuf.cpp => sizebuf.c} (100%)
 rename project/jni/application/opentyrian/src/{sndmast.cpp => sndmast.c} (100%)
 rename project/jni/application/opentyrian/src/{sprite.cpp => sprite.c} (100%)
 rename project/jni/application/opentyrian/src/{starlib.cpp => starlib.c} (100%)
 rename project/jni/application/opentyrian/src/{tyrian2.cpp => tyrian2.c} (100%)
 rename project/jni/application/opentyrian/src/{varz.cpp => varz.c} (100%)
 rename project/jni/application/opentyrian/src/{vga256d.cpp => vga256d.c} (100%)
 rename project/jni/application/opentyrian/src/{vga_palette.cpp => vga_palette.c} (100%)
 rename project/jni/application/opentyrian/src/{video.cpp => video.c} (100%)
 rename project/jni/application/opentyrian/src/{video_scale.cpp => video_scale.c} (100%)
 rename project/jni/application/opentyrian/src/{video_scale_hqNx.cpp => video_scale_hqNx.c} (100%)
 rename project/jni/application/opentyrian/src/{xmas.cpp => xmas.c} (100%)

diff --git a/project/jni/application/opentyrian/src/animlib.cpp b/project/jni/application/opentyrian/src/animlib.c
similarity index 100%
rename from project/jni/application/opentyrian/src/animlib.cpp
rename to project/jni/application/opentyrian/src/animlib.c
diff --git a/project/jni/application/opentyrian/src/arg_parse.cpp b/project/jni/application/opentyrian/src/arg_parse.c
similarity index 100%
rename from project/jni/application/opentyrian/src/arg_parse.cpp
rename to project/jni/application/opentyrian/src/arg_parse.c
diff --git a/project/jni/application/opentyrian/src/backgrnd.cpp b/project/jni/application/opentyrian/src/backgrnd.c
similarity index 100%
rename from project/jni/application/opentyrian/src/backgrnd.cpp
rename to project/jni/application/opentyrian/src/backgrnd.c
diff --git a/project/jni/application/opentyrian/src/cJSON.cpp b/project/jni/application/opentyrian/src/cJSON.c
similarity index 100%
rename from project/jni/application/opentyrian/src/cJSON.cpp
rename to project/jni/application/opentyrian/src/cJSON.c
diff --git a/project/jni/application/opentyrian/src/config.cpp b/project/jni/application/opentyrian/src/config.c
similarity index 100%
rename from project/jni/application/opentyrian/src/config.cpp
rename to project/jni/application/opentyrian/src/config.c
diff --git a/project/jni/application/opentyrian/src/config.h b/project/jni/application/opentyrian/src/config.h
index 9d4633ea3..fca40f48d 100644
--- a/project/jni/application/opentyrian/src/config.h
+++ b/project/jni/application/opentyrian/src/config.h
@@ -140,15 +140,15 @@ extern JE_byte processorType;
 extern JE_SaveFilesType saveFiles;
 extern JE_SaveGameTemp saveTemp;
 extern JE_word editorLevel;
-enum AutoFireMode_t { AUTOFIRE_TOUCHSCREEN, AUTOFIRE_BUTTON, AUTOFIRE_BUTTON_TOUCH, AUTOFIRE_NONE, AUTOFIRE_LAST };
+typedef enum { AUTOFIRE_TOUCHSCREEN, AUTOFIRE_BUTTON, AUTOFIRE_BUTTON_TOUCH, AUTOFIRE_NONE, AUTOFIRE_LAST } AutoFireMode_t;
 extern AutoFireMode_t autoFireMode;
-enum TouchscreenMode_t { 
+typedef enum { 
 	TOUCHSCREEN_SHIP_ABOVE_FINGER, 
 	TOUCHSCREEN_SHIP_TO_THE_LEFT, 
 	TOUCHSCREEN_SHIP_BELOW_FINGER, 
 	TOUCHSCREEN_FIRE_ONLY, 
 	TOUCHSCREEN_NONE, 
-	TOUCHSCREEN_LAST };
+	TOUCHSCREEN_LAST } TouchscreenMode_t;
 extern TouchscreenMode_t touchscreenMode;
 
 
diff --git a/project/jni/application/opentyrian/src/destruct.cpp b/project/jni/application/opentyrian/src/destruct.c
similarity index 98%
rename from project/jni/application/opentyrian/src/destruct.cpp
rename to project/jni/application/opentyrian/src/destruct.c
index 773d089ac..7ea2978ee 100644
--- a/project/jni/application/opentyrian/src/destruct.cpp
+++ b/project/jni/application/opentyrian/src/destruct.c
@@ -720,16 +720,16 @@ void JE_destructGame( void )
 	load_destruct_config();
 
 	//malloc things that have customizable sizes
-	shotRec  = (destruct_shot_s *)malloc(sizeof(struct destruct_shot_s)  * config.max_shots);
-	exploRec = (destruct_explo_s *)malloc(sizeof(struct destruct_explo_s) * config.max_explosions);
-	world.mapWalls = (destruct_wall_s *)malloc(sizeof(struct destruct_wall_s) * config.max_walls);
+	shotRec  = malloc(sizeof(struct destruct_shot_s)  * config.max_shots);
+	exploRec = malloc(sizeof(struct destruct_explo_s) * config.max_explosions);
+	world.mapWalls = malloc(sizeof(struct destruct_wall_s) * config.max_walls);
 
 	//Malloc enough structures to cover all of this session's possible needs.
 	for(i = 0; i < 10; i++) {
 		config.max_installations = MAX(config.max_installations, basetypes[i][0]);
 	}
-	player[PLAYER_LEFT ].unit = (destruct_unit_s *)malloc(sizeof(struct destruct_unit_s) * config.max_installations);
-	player[PLAYER_RIGHT].unit = (destruct_unit_s *)malloc(sizeof(struct destruct_unit_s) * config.max_installations);
+	player[PLAYER_LEFT ].unit = malloc(sizeof(struct destruct_unit_s) * config.max_installations);
+	player[PLAYER_RIGHT].unit = malloc(sizeof(struct destruct_unit_s) * config.max_installations);
 
 	destructTempScreen = game_screen;
 	world.VGAScreen = VGAScreen;
@@ -836,7 +836,7 @@ enum de_mode_t JE_modeSelect( void )
 	mode = MODE_5CARDWAR;
 
 	// Draw the menu and fade us in
-	DrawModeSelectMenu((de_mode_t)mode);
+	DrawModeSelectMenu(mode);
 
 	JE_showVGA();
 	fade_palette(colors, 15, 0, 255);
@@ -845,7 +845,7 @@ enum de_mode_t JE_modeSelect( void )
 	while(1)
 	{
 		/* Re-draw the menu every iteration */
-		DrawModeSelectMenu((de_mode_t)mode);
+		DrawModeSelectMenu(mode);
 		JE_showVGA();
 
 		/* Grab keys */
@@ -898,7 +898,7 @@ enum de_mode_t JE_modeSelect( void )
 	fade_black(15);
 	memcpy(VGAScreen->pixels, VGAScreen2->pixels, VGAScreen->h * VGAScreen->pitch);
 	JE_showVGA();
-	return((de_mode_t)mode);
+	return(mode);
 }
 
 void JE_generateTerrain( void )
@@ -1039,7 +1039,7 @@ void DE_generateUnits( unsigned int * baseWorld )
 			}
 
 			player[i].unit[j].unitY = JE_placementPosition(player[i].unit[j].unitX - 1, 14, baseWorld);
-			player[i].unit[j].unitType = (de_unit_t)basetypes[baseLookup[i][world.destructMode]][(mt_rand() % 10) + 1];
+			player[i].unit[j].unitType = basetypes[baseLookup[i][world.destructMode]][(mt_rand() % 10) + 1];
 
 			/* Sats are special cases since they are useless.  They don't count
 			 * as active units and we can't have a team of all sats */
@@ -1071,7 +1071,7 @@ void DE_generateUnits( unsigned int * baseWorld )
 			player[i].unit[j].isYInAir = false;
 			player[i].unit[j].angle = 0;
 			player[i].unit[j].power = (player[i].unit[j].unitType == UNIT_LASER) ? 6 : 3;
-			player[i].unit[j].shotType = (de_shot_t)defaultWeapon[player[i].unit[j].unitType];
+			player[i].unit[j].shotType = defaultWeapon[player[i].unit[j].unitType];
 			player[i].unit[j].health = baseDamage[player[i].unit[j].unitType];
 			player[i].unit[j].ani_frame = 0;
 		}
@@ -1357,7 +1357,7 @@ void JE_makeExplosion( unsigned int tempPosX, unsigned int tempPosY, enum de_sho
 
 		exploRec[i].explomax  = tempExploSize;
 		exploRec[i].explofill = exploDensity[shottype];
-		exploRec[i].exploType = (de_expl_t)shotDirt[shottype];
+		exploRec[i].exploType = shotDirt[shottype];
 	}
 	else
 	{
@@ -1574,9 +1574,9 @@ void DE_ResetAI( void )
 			ptr->power = (ptr->unitType == UNIT_LASER) ? 6 : 4;
 
 			if (world.mapFlags & MAP_WALLS)
-				ptr->shotType = (de_shot_t)defaultCpuWeaponB[ptr->unitType];
+				ptr->shotType = defaultCpuWeaponB[ptr->unitType];
 			else
-				ptr->shotType = (de_shot_t)defaultCpuWeapon[ptr->unitType];
+				ptr->shotType = defaultCpuWeapon[ptr->unitType];
 		}
 	}
 }
@@ -1750,7 +1750,7 @@ void DE_RunTickGravity( void )
 			}
 
 		/* Draw the unit. */
-		DE_GravityDrawUnit((de_player_t)i, unit);
+		DE_GravityDrawUnit(i, unit);
 		}
 	}
 }
@@ -1945,7 +1945,7 @@ void DE_TestExplosionCollision( unsigned int PosX, unsigned int PosY)
 				unit->health--;
 				if (unit->health <= 0)
 				{
-					DE_DestroyUnit((de_player_t)i, unit);
+					DE_DestroyUnit(i, unit);
 				}
 			}
 		}
@@ -2041,7 +2041,7 @@ void DE_RunTickShots( void )
 				 && tempPosY < unit->unitY && tempPosY > unit->unitY - 13)
 				{
 					shotRec[i].isAvailable = true;
-					JE_makeExplosion(tempPosX, tempPosY, (de_shot_t)shotRec[i].shottype);
+					JE_makeExplosion(tempPosX, tempPosY, shotRec[i].shottype);
 				}
 			}
 		}
@@ -2074,7 +2074,7 @@ void DE_RunTickShots( void )
 					/* Blow up the wall and remove the shot. */
 					world.mapWalls[j].wallExist = false;
 					shotRec[i].isAvailable = true;
-					JE_makeExplosion(tempPosX, tempPosY, (de_shot_t)shotRec[i].shottype);
+					JE_makeExplosion(tempPosX, tempPosY, shotRec[i].shottype);
 					continue;
 				}
 				else
@@ -2104,7 +2104,7 @@ void DE_RunTickShots( void )
 		if((((Uint8 *)destructTempScreen->pixels)[tempPosX + tempPosY * destructTempScreen->pitch]) == PIXEL_DIRT)
 		{
 			shotRec[i].isAvailable = true;
-			JE_makeExplosion(tempPosX, tempPosY, (de_shot_t)shotRec[i].shottype);
+			JE_makeExplosion(tempPosX, tempPosY, shotRec[i].shottype);
 			continue;
 		}
 	}
@@ -2580,12 +2580,12 @@ void DE_ProcessInput( void )
 					break;
 
 				case EXPL_MAGNET:
-					DE_RunMagnet((de_player_t)player_index, curUnit);
+					DE_RunMagnet(player_index, curUnit);
 					break;
 
 				case EXPL_DIRT:
 				case EXPL_NORMAL:
-					DE_MakeShot((de_player_t)player_index, curUnit, direction);
+					DE_MakeShot(player_index, curUnit, direction);
 					break;
 
 				default:
@@ -2599,7 +2599,7 @@ void DE_CycleWeaponUp( struct destruct_unit_s * unit )
 {
 	do
 	{
-		unit->shotType = (de_shot_t)((int)unit->shotType + 1);
+		unit->shotType = ((int)unit->shotType + 1);
 		if (unit->shotType > SHOT_LAST)
 		{
 			unit->shotType = SHOT_FIRST;
@@ -2610,7 +2610,7 @@ void DE_CycleWeaponDown( struct destruct_unit_s * unit )
 {
 	do
 	{
-		unit->shotType = (de_shot_t)((int)unit->shotType - 1);
+		unit->shotType = ((int)unit->shotType - 1);
 		if (unit->shotType < SHOT_FIRST)
 		{
 			unit->shotType = SHOT_LAST;
diff --git a/project/jni/application/opentyrian/src/editship.cpp b/project/jni/application/opentyrian/src/editship.c
similarity index 100%
rename from project/jni/application/opentyrian/src/editship.cpp
rename to project/jni/application/opentyrian/src/editship.c
diff --git a/project/jni/application/opentyrian/src/episodes.cpp b/project/jni/application/opentyrian/src/episodes.c
similarity index 100%
rename from project/jni/application/opentyrian/src/episodes.cpp
rename to project/jni/application/opentyrian/src/episodes.c
diff --git a/project/jni/application/opentyrian/src/episodes.h b/project/jni/application/opentyrian/src/episodes.h
index 2ebb749e3..baf4bc60a 100644
--- a/project/jni/application/opentyrian/src/episodes.h
+++ b/project/jni/application/opentyrian/src/episodes.h
@@ -146,18 +146,18 @@ typedef struct
 	JE_word     eenemydie;
 } JE_EnemyDatType[ENEMY_NUM + 1]; /* [0..enemynum] */
 
-extern "C" JE_WeaponPortType weaponPort;
-extern "C" JE_WeaponType weapons;
-extern "C" JE_PowerType powerSys;
-extern "C" JE_ShipType ships;
-extern "C" JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
-extern "C" JE_ShieldType shields;
-extern "C" JE_SpecialType special;
-extern "C" JE_EnemyDatType enemyDat;
-extern "C" JE_byte initial_episode_num, episodeNum;
-extern "C" JE_boolean episodeAvail[EPISODE_MAX];
+extern JE_WeaponPortType weaponPort;
+extern JE_WeaponType weapons;
+extern JE_PowerType powerSys;
+extern JE_ShipType ships;
+extern JE_OptionType options[OPTION_NUM + 1]; /* [0..optionnum] */
+extern JE_ShieldType shields;
+extern JE_SpecialType special;
+extern JE_EnemyDatType enemyDat;
+extern JE_byte initial_episode_num, episodeNum;
+extern JE_boolean episodeAvail[EPISODE_MAX];
 
-extern "C" char episode_file[13], cube_file[13];
+extern char episode_file[13], cube_file[13];
 
 extern JE_longint episode1DataLoc;
 extern JE_boolean bonusLevel;
diff --git a/project/jni/application/opentyrian/src/file.cpp b/project/jni/application/opentyrian/src/file.c
similarity index 100%
rename from project/jni/application/opentyrian/src/file.cpp
rename to project/jni/application/opentyrian/src/file.c
diff --git a/project/jni/application/opentyrian/src/fm_synth.cpp b/project/jni/application/opentyrian/src/fm_synth.c
similarity index 100%
rename from project/jni/application/opentyrian/src/fm_synth.cpp
rename to project/jni/application/opentyrian/src/fm_synth.c
diff --git a/project/jni/application/opentyrian/src/fmopl.cpp b/project/jni/application/opentyrian/src/fmopl.c
similarity index 100%
rename from project/jni/application/opentyrian/src/fmopl.cpp
rename to project/jni/application/opentyrian/src/fmopl.c
diff --git a/project/jni/application/opentyrian/src/font.cpp b/project/jni/application/opentyrian/src/font.c
similarity index 100%
rename from project/jni/application/opentyrian/src/font.cpp
rename to project/jni/application/opentyrian/src/font.c
diff --git a/project/jni/application/opentyrian/src/fonthand.cpp b/project/jni/application/opentyrian/src/fonthand.c
similarity index 100%
rename from project/jni/application/opentyrian/src/fonthand.cpp
rename to project/jni/application/opentyrian/src/fonthand.c
diff --git a/project/jni/application/opentyrian/src/game_menu.cpp b/project/jni/application/opentyrian/src/game_menu.c
similarity index 100%
rename from project/jni/application/opentyrian/src/game_menu.cpp
rename to project/jni/application/opentyrian/src/game_menu.c
diff --git a/project/jni/application/opentyrian/src/helptext.cpp b/project/jni/application/opentyrian/src/helptext.c
similarity index 100%
rename from project/jni/application/opentyrian/src/helptext.cpp
rename to project/jni/application/opentyrian/src/helptext.c
diff --git a/project/jni/application/opentyrian/src/joystick.cpp b/project/jni/application/opentyrian/src/joystick.c
similarity index 100%
rename from project/jni/application/opentyrian/src/joystick.cpp
rename to project/jni/application/opentyrian/src/joystick.c
diff --git a/project/jni/application/opentyrian/src/jukebox.cpp b/project/jni/application/opentyrian/src/jukebox.c
similarity index 100%
rename from project/jni/application/opentyrian/src/jukebox.cpp
rename to project/jni/application/opentyrian/src/jukebox.c
diff --git a/project/jni/application/opentyrian/src/keyboard.cpp b/project/jni/application/opentyrian/src/keyboard.c
similarity index 100%
rename from project/jni/application/opentyrian/src/keyboard.cpp
rename to project/jni/application/opentyrian/src/keyboard.c
diff --git a/project/jni/application/opentyrian/src/lds_play.cpp b/project/jni/application/opentyrian/src/lds_play.c
similarity index 100%
rename from project/jni/application/opentyrian/src/lds_play.cpp
rename to project/jni/application/opentyrian/src/lds_play.c
diff --git a/project/jni/application/opentyrian/src/loudness.cpp b/project/jni/application/opentyrian/src/loudness.c
similarity index 100%
rename from project/jni/application/opentyrian/src/loudness.cpp
rename to project/jni/application/opentyrian/src/loudness.c
diff --git a/project/jni/application/opentyrian/src/lvllib.cpp b/project/jni/application/opentyrian/src/lvllib.c
similarity index 100%
rename from project/jni/application/opentyrian/src/lvllib.cpp
rename to project/jni/application/opentyrian/src/lvllib.c
diff --git a/project/jni/application/opentyrian/src/lvlmast.cpp b/project/jni/application/opentyrian/src/lvlmast.c
similarity index 100%
rename from project/jni/application/opentyrian/src/lvlmast.cpp
rename to project/jni/application/opentyrian/src/lvlmast.c
diff --git a/project/jni/application/opentyrian/src/mainint.cpp b/project/jni/application/opentyrian/src/mainint.c
similarity index 100%
rename from project/jni/application/opentyrian/src/mainint.cpp
rename to project/jni/application/opentyrian/src/mainint.c
diff --git a/project/jni/application/opentyrian/src/menus.cpp b/project/jni/application/opentyrian/src/menus.c
similarity index 100%
rename from project/jni/application/opentyrian/src/menus.cpp
rename to project/jni/application/opentyrian/src/menus.c
diff --git a/project/jni/application/opentyrian/src/mingw_fixes.cpp b/project/jni/application/opentyrian/src/mingw_fixes.c
similarity index 100%
rename from project/jni/application/opentyrian/src/mingw_fixes.cpp
rename to project/jni/application/opentyrian/src/mingw_fixes.c
diff --git a/project/jni/application/opentyrian/src/mouse.cpp b/project/jni/application/opentyrian/src/mouse.c
similarity index 100%
rename from project/jni/application/opentyrian/src/mouse.cpp
rename to project/jni/application/opentyrian/src/mouse.c
diff --git a/project/jni/application/opentyrian/src/mtrand.cpp b/project/jni/application/opentyrian/src/mtrand.c
similarity index 100%
rename from project/jni/application/opentyrian/src/mtrand.cpp
rename to project/jni/application/opentyrian/src/mtrand.c
diff --git a/project/jni/application/opentyrian/src/musmast.cpp b/project/jni/application/opentyrian/src/musmast.c
similarity index 100%
rename from project/jni/application/opentyrian/src/musmast.cpp
rename to project/jni/application/opentyrian/src/musmast.c
diff --git a/project/jni/application/opentyrian/src/network.cpp b/project/jni/application/opentyrian/src/network.c
similarity index 100%
rename from project/jni/application/opentyrian/src/network.cpp
rename to project/jni/application/opentyrian/src/network.c
diff --git a/project/jni/application/opentyrian/src/nortsong.cpp b/project/jni/application/opentyrian/src/nortsong.c
similarity index 100%
rename from project/jni/application/opentyrian/src/nortsong.cpp
rename to project/jni/application/opentyrian/src/nortsong.c
diff --git a/project/jni/application/opentyrian/src/nortvars.cpp b/project/jni/application/opentyrian/src/nortvars.c
similarity index 100%
rename from project/jni/application/opentyrian/src/nortvars.cpp
rename to project/jni/application/opentyrian/src/nortvars.c
diff --git a/project/jni/application/opentyrian/src/opentyr.cpp b/project/jni/application/opentyrian/src/opentyr.c
similarity index 98%
rename from project/jni/application/opentyrian/src/opentyr.cpp
rename to project/jni/application/opentyrian/src/opentyr.c
index 8ddb0ffb9..038add4ef 100644
--- a/project/jni/application/opentyrian/src/opentyr.cpp
+++ b/project/jni/application/opentyrian/src/opentyr.c
@@ -74,12 +74,16 @@ const char *opentyrian_menu_items[] =
 };
 
 #ifndef ANDROID
-const int menu_item_scaler   = 2;
-const int menu_item_jukebox  = 3;
+enum {
+	menu_item_scaler   = 2,
+	menu_item_jukebox  = 3
+};
 #else
-const int menu_item_scaler   = 1;
-const int menu_item_jukebox  = 2;
-const int menu_item_destruct = 3;
+enum {
+	menu_item_scaler   = 1,
+	menu_item_jukebox  = 2,
+	menu_item_destruct = 3
+};
 #endif
 
 /* zero-terminated strncpy */
diff --git a/project/jni/application/opentyrian/src/palette.cpp b/project/jni/application/opentyrian/src/palette.c
similarity index 100%
rename from project/jni/application/opentyrian/src/palette.cpp
rename to project/jni/application/opentyrian/src/palette.c
diff --git a/project/jni/application/opentyrian/src/params.cpp b/project/jni/application/opentyrian/src/params.c
similarity index 100%
rename from project/jni/application/opentyrian/src/params.cpp
rename to project/jni/application/opentyrian/src/params.c
diff --git a/project/jni/application/opentyrian/src/pcxload.cpp b/project/jni/application/opentyrian/src/pcxload.c
similarity index 100%
rename from project/jni/application/opentyrian/src/pcxload.cpp
rename to project/jni/application/opentyrian/src/pcxload.c
diff --git a/project/jni/application/opentyrian/src/pcxmast.cpp b/project/jni/application/opentyrian/src/pcxmast.c
similarity index 100%
rename from project/jni/application/opentyrian/src/pcxmast.cpp
rename to project/jni/application/opentyrian/src/pcxmast.c
diff --git a/project/jni/application/opentyrian/src/picload.cpp b/project/jni/application/opentyrian/src/picload.c
similarity index 100%
rename from project/jni/application/opentyrian/src/picload.cpp
rename to project/jni/application/opentyrian/src/picload.c
diff --git a/project/jni/application/opentyrian/src/player.cpp b/project/jni/application/opentyrian/src/player.c
similarity index 100%
rename from project/jni/application/opentyrian/src/player.cpp
rename to project/jni/application/opentyrian/src/player.c
diff --git a/project/jni/application/opentyrian/src/scroller.cpp b/project/jni/application/opentyrian/src/scroller.c
similarity index 100%
rename from project/jni/application/opentyrian/src/scroller.cpp
rename to project/jni/application/opentyrian/src/scroller.c
diff --git a/project/jni/application/opentyrian/src/setup.cpp b/project/jni/application/opentyrian/src/setup.c
similarity index 100%
rename from project/jni/application/opentyrian/src/setup.cpp
rename to project/jni/application/opentyrian/src/setup.c
diff --git a/project/jni/application/opentyrian/src/sizebuf.cpp b/project/jni/application/opentyrian/src/sizebuf.c
similarity index 100%
rename from project/jni/application/opentyrian/src/sizebuf.cpp
rename to project/jni/application/opentyrian/src/sizebuf.c
diff --git a/project/jni/application/opentyrian/src/sndmast.cpp b/project/jni/application/opentyrian/src/sndmast.c
similarity index 100%
rename from project/jni/application/opentyrian/src/sndmast.cpp
rename to project/jni/application/opentyrian/src/sndmast.c
diff --git a/project/jni/application/opentyrian/src/sprite.cpp b/project/jni/application/opentyrian/src/sprite.c
similarity index 100%
rename from project/jni/application/opentyrian/src/sprite.cpp
rename to project/jni/application/opentyrian/src/sprite.c
diff --git a/project/jni/application/opentyrian/src/starlib.cpp b/project/jni/application/opentyrian/src/starlib.c
similarity index 100%
rename from project/jni/application/opentyrian/src/starlib.cpp
rename to project/jni/application/opentyrian/src/starlib.c
diff --git a/project/jni/application/opentyrian/src/tyrian2.cpp b/project/jni/application/opentyrian/src/tyrian2.c
similarity index 100%
rename from project/jni/application/opentyrian/src/tyrian2.cpp
rename to project/jni/application/opentyrian/src/tyrian2.c
diff --git a/project/jni/application/opentyrian/src/varz.cpp b/project/jni/application/opentyrian/src/varz.c
similarity index 100%
rename from project/jni/application/opentyrian/src/varz.cpp
rename to project/jni/application/opentyrian/src/varz.c
diff --git a/project/jni/application/opentyrian/src/vga256d.cpp b/project/jni/application/opentyrian/src/vga256d.c
similarity index 100%
rename from project/jni/application/opentyrian/src/vga256d.cpp
rename to project/jni/application/opentyrian/src/vga256d.c
diff --git a/project/jni/application/opentyrian/src/vga_palette.cpp b/project/jni/application/opentyrian/src/vga_palette.c
similarity index 100%
rename from project/jni/application/opentyrian/src/vga_palette.cpp
rename to project/jni/application/opentyrian/src/vga_palette.c
diff --git a/project/jni/application/opentyrian/src/video.cpp b/project/jni/application/opentyrian/src/video.c
similarity index 100%
rename from project/jni/application/opentyrian/src/video.cpp
rename to project/jni/application/opentyrian/src/video.c
diff --git a/project/jni/application/opentyrian/src/video_scale.cpp b/project/jni/application/opentyrian/src/video_scale.c
similarity index 100%
rename from project/jni/application/opentyrian/src/video_scale.cpp
rename to project/jni/application/opentyrian/src/video_scale.c
diff --git a/project/jni/application/opentyrian/src/video_scale_hqNx.cpp b/project/jni/application/opentyrian/src/video_scale_hqNx.c
similarity index 100%
rename from project/jni/application/opentyrian/src/video_scale_hqNx.cpp
rename to project/jni/application/opentyrian/src/video_scale_hqNx.c
diff --git a/project/jni/application/opentyrian/src/xmas.cpp b/project/jni/application/opentyrian/src/xmas.c
similarity index 100%
rename from project/jni/application/opentyrian/src/xmas.cpp
rename to project/jni/application/opentyrian/src/xmas.c