miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OpenTyrian: Reverted C++-isms from code, to match upstream more closely

Browse Source
This commit is contained in:
pelya
2014-06-09 00:30:50 +03:00
parent cc172312e5
commit eb81855ac7
22 changed files with 80 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
project/jni/application/opentyrian/src/destruct.c
View File

@@ -406,14 +406,13 @@ static struct destruct_explo_s * exploRec;
enum de_unit_t string_to_unit_enum(const char * str) {
// A config helper function. Probably not useful anywhere else.
//enum de_unit_t i;
int i;
enum de_unit_t i;
static const char * unit_names[] =
{ "UNIT_TANK", "UNIT_NUKE", "UNIT_DIRT", "UNIT_SATELLITE",
"UNIT_MAGNET", "UNIT_LASER", "UNIT_JUMPER", "UNIT_HELI" };
for (i = UNIT_FIRST; i < MAX_UNITS; i++) {
if(strcmp(unit_names[i], str) == 0) { return((enum de_unit_t)i); }
if(strcmp(unit_names[i], str) == 0) { return(i); }
}
return(UNIT_NONE);
@@ -599,7 +598,7 @@ void load_destruct_config( void ) {
#ifndef ANDROID
unsigned int j, k;
int i;//enum de_player_t i;
enum de_player_t i;
enum de_unit_t temp;
char buffer[40];
const char * key_names[] = { "left", "right", "up", "down", "change", "fire", "cyup", "cydn" };