shithub: cstory

Info  •  Files  •  Log  •  Branches

Fixed DoConfig

Turns out I never fixed the button order in the first place.

--- a/DoConfig/DoConfig.cpp

+++ b/DoConfig/DoConfig.cpp

@@ -111,8 +111,6 @@

 	}

 }

-const unsigned int button_lookup[8] = {0, 1, 2, 5, 3, 4, 6, 7};

-

 void read_Config(){

 	std::fstream fd;

 	fd.open("Config.dat", std::ios::in | std::ios::binary);

@@ -141,7 +139,8 @@

 	for(char i=0;i<8;i++){

 		const unsigned long button = CharsToLong(config.buttons[i]);

 		if(button<9 && button>0){

-			joyRows[button_lookup[i]]->value(button-1);

+			const unsigned int button_lookup[6] = {0, 1, 2, 4, 5, 3};

+			joyRows[i]->value(button_lookup[button-1]);

 		}

 	}

 }

@@ -154,7 +153,8 @@

 	LongToChars(displaychoice->value(), config.display);

 	LongToChars(joychoice->value(), config.useJoy);

 	for(char i =0;i<8;i++){

-		LongToChars(joyRows[button_lookup[i]]->value()+1, config.buttons[i]);

+		const unsigned int button_lookup[6] = {0, 1, 2, 5, 3, 4};

+		LongToChars(button_lookup[joyRows[i]->value()]+1, config.buttons[i]);

 	}

 	std::fstream fd;

 	fd.open("Config.dat", std::ios::out | std::ios::binary);