thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'waypoints' into sal-waypoints

Browse source
This commit is contained in:
Sally Cochenour 2020-03-15 20:23:24 -04:00
commit 1e10ec00d7
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile
View file

@ -494,10 +494,10 @@ OBJS:=$(i_main_o) \
$(OBJDIR)/y_inter.o \ $(OBJDIR)/y_inter.o \
$(OBJDIR)/st_stuff.o \ $(OBJDIR)/st_stuff.o \
$(OBJDIR)/k_kart.o \ $(OBJDIR)/k_kart.o \
$(OBJDIR)/k_pwrlv.o \
$(OBJDIR)/k_waypoint.o\ $(OBJDIR)/k_waypoint.o\
$(OBJDIR)/k_pathfind.o\ $(OBJDIR)/k_pathfind.o\
$(OBJDIR)/k_bheap.o \ $(OBJDIR)/k_bheap.o \
$(OBJDIR)/k_pwrlv.o \
$(OBJDIR)/m_aatree.o \ $(OBJDIR)/m_aatree.o \
$(OBJDIR)/m_anigif.o \ $(OBJDIR)/m_anigif.o \
$(OBJDIR)/m_argv.o \ $(OBJDIR)/m_argv.o \

2
src/p_map.c
View file

@ -223,6 +223,8 @@ static boolean P_SpecialIsLinedefCrossType(UINT16 ldspecial)
return linedefcrossspecial; return linedefcrossspecial;
} }
//#define TELEPORTJANK
boolean P_DoSpring(mobj_t *spring, mobj_t *object) boolean P_DoSpring(mobj_t *spring, mobj_t *object)
{ {
//INT32 pflags; //INT32 pflags;

2
src/p_setup.c
View file

@ -84,8 +84,8 @@
// SRB2Kart // SRB2Kart
#include "k_kart.h" #include "k_kart.h"
#include "k_waypoint.h"
#include "k_pwrlv.h" #include "k_pwrlv.h"
#include "k_waypoint.h"
// //
// Map MD5, calculated on level load. // Map MD5, calculated on level load.