Merge remote-tracking branch 'origin/next' into subvsdub
This commit is contained in:
commit
403de4b767
2 changed files with 2 additions and 2 deletions
|
|
@ -3946,7 +3946,7 @@ static mobj_t *K_SpawnKartMissile(mobj_t *source, mobjtype_t type, angle_t an, I
|
|||
P_SetTarget(&throwmo->target, source);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
return throwmo;
|
||||
}
|
||||
|
||||
UINT16 K_DriftSparkColor(player_t *player, INT32 charge)
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
// it's only for detection of the version the player is using so the MS can alert them of an update.
|
||||
// Only set it higher, not lower, obviously.
|
||||
// Note that we use this to help keep internal testing in check; this is why v2.0 is not version "2".
|
||||
#define MODVERSION 11
|
||||
#define MODVERSION 12
|
||||
|
||||
// Define this as a prerelease version suffix
|
||||
//#define BETAVERSION "Alpha"
|
||||
|
|
|
|||
Loading…
Reference in a new issue