vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #32 from coltongit/patch-4 

Port fixes from fdsfgsfds' fork
This commit is contained in:
Vinícius R. Miguel 2020-05-10 00:28:33 -03:00 committed by GitHub
parent 19252e4275 ad89f663f3
commit b4626bf3b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -647,7 +647,7 @@ $(SOUND_BIN_DIR)/sequences.bin.c: $(SOUND_BIN_DIR)/sequences.bin
echo "};" >> $@ echo "};" >> $@
$(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets $(SOUND_BIN_DIR)/bank_sets.c: $(SOUND_BIN_DIR)/bank_sets
echo "unsigned char gBankSetsData[] = {" > $@ echo "unsigned char gBankSetsData[0x100] = {" > $@
hexdump -v -e '1/1 "0x%X,"' $< >> $@ hexdump -v -e '1/1 "0x%X,"' $< >> $@
echo "};" >> $@ echo "};" >> $@

4
src/pc/gfx/gfx_sdl2.c
View File

@ -131,8 +131,8 @@ static void gfx_sdl_init(void) {
} }
for (size_t i = 0; i < sizeof(scancode_rmapping_nonextended) / sizeof(scancode_rmapping_nonextended[0]); i++) { for (size_t i = 0; i < sizeof(scancode_rmapping_nonextended) / sizeof(scancode_rmapping_nonextended[0]); i++) {
inverted_scancode_table[scancode_rmapping_extended[i][0]] = inverted_scancode_table[scancode_rmapping_extended[i][1]]; inverted_scancode_table[scancode_rmapping_nonextended[i][0]] = inverted_scancode_table[scancode_rmapping_nonextended[i][1]];
inverted_scancode_table[scancode_rmapping_extended[i][1]] += 0x100; inverted_scancode_table[scancode_rmapping_nonextended[i][1]] += 0x100;
} }
} }