ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #841 from lifehackerhansol/cmdline-misleading-indentation 

commandline: avoid misleading indentation
This commit is contained in:
zeromus 2024-10-01 05:43:24 -04:00 committed by GitHub
parent 91196788eb fa1879f9a7
commit e7442cc999
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
desmume/src/commandline.cpp
View File

@ -612,23 +612,23 @@ void CommandLine::process_addonCommands()
slot1_Change(NDS_SLOT1_R4); slot1_Change(NDS_SLOT1_R4);
else if(slot1 == "RETAILNAND") else if(slot1 == "RETAILNAND")
slot1_Change(NDS_SLOT1_RETAIL_NAND); slot1_Change(NDS_SLOT1_RETAIL_NAND);
else if(slot1 == "RETAILMCROM") else if(slot1 == "RETAILMCROM")
slot1_Change(NDS_SLOT1_RETAIL_MCROM); slot1_Change(NDS_SLOT1_RETAIL_MCROM);
else if(slot1 == "RETAILDEBUG") else if(slot1 == "RETAILDEBUG")
slot1_Change(NDS_SLOT1_RETAIL_DEBUG); slot1_Change(NDS_SLOT1_RETAIL_DEBUG);
if (_rtc_day != -1 || _rtc_hour != -1) { if (_rtc_day != -1 || _rtc_hour != -1) {
DateTime now = DateTime::get_Now(); DateTime now = DateTime::get_Now();
int cur_day = now.get_DayOfWeek(); int cur_day = now.get_DayOfWeek();
int cur_hour = now.get_Hour(); int cur_hour = now.get_Hour();
int cur_total = cur_day * 24 + cur_hour; int cur_total = cur_day * 24 + cur_hour;
int day = (_rtc_day != -1 ? _rtc_day : cur_day); int day = (_rtc_day != -1 ? _rtc_day : cur_day);
int hour = (_rtc_hour != -1 ? _rtc_hour : cur_hour); int hour = (_rtc_hour != -1 ? _rtc_hour : cur_hour);
int total = day * 24 + hour; int total = day * 24 + hour;
int diff = total - cur_total; int diff = total - cur_total;
if (diff < 0) if (diff < 0)
diff += 24 * 7; diff += 24 * 7;
rtcHourOverride = diff; rtcHourOverride = diff;
} }
} }