thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'srb2/next' into yet-another-next-merge

Browse source
This commit is contained in:
James R 2021-04-06 16:20:44 -07:00
commit c4af0c2374
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile
View file

@ -745,7 +745,7 @@ endif
endif endif
define deps_rule += define deps_rule +=
$(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$< $< $(CC) $(CFLAGS) -M -MF $@ -MT $(OBJDIR)/$(<:.c=.o) $<
endef endef
$(DEPDIR)/%.d: %.c $(DEPDIR)/%.d: %.c

4
src/console.c
View file

@ -1332,10 +1332,6 @@ boolean CON_Responder(event_t *ev)
if (key < 32 || key > 127) if (key < 32 || key > 127)
return true; return true;
// add key to cmd line here
if (key >= 'A' && key <= 'Z' && !(shiftdown ^ capslock)) //this is only really necessary for dedicated servers
key = key + 'a' - 'A';
if (input_sel != input_cur) if (input_sel != input_cur)
CON_InputDelSelection(); CON_InputDelSelection();
CON_InputAddChar(key); CON_InputAddChar(key);

4
src/w_wad.c
View file

@ -802,8 +802,10 @@ UINT16 W_InitFile(const char *filename, boolean mainfile, boolean startup)
} }
if (important && !mainfile) if (important && !mainfile)
//G_SetGameModified(true, false); {
//G_SetGameModified(true);
modifiedgame = true; // avoid savemoddata being set to false modifiedgame = true; // avoid savemoddata being set to false
}
// //
// link wad file to search files // link wad file to search files