File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
TheForceEngine/TFE_ExternalData Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 3
3
#include < TFE_System/cJSON.h>
4
4
#include < TFE_System/system.h>
5
5
#include < TFE_FileSystem/filestream.h>
6
- #include < TFE_DarkForces/player.h>
7
6
#include < TFE_DarkForces/projectile.h>
8
7
#include < TFE_DarkForces/weapon.h>
9
8
#include " weaponExternal.h"
Original file line number Diff line number Diff line change 1
1
#pragma once
2
2
#include < TFE_System/types.h>
3
+ #include < TFE_DarkForces/player.h>
3
4
4
5
// /////////////////////////////////////////
5
6
// TFE Externalised Weapon data
@@ -72,21 +73,21 @@ namespace TFE_ExternalData
72
73
struct ExternalWeapon
73
74
{
74
75
const char * name = nullptr ;
75
- s32 frameCount = 0 ;
76
- const char * textures[WEAPON_NUM_TEXTURES] = {};
76
+ s32 frameCount = 1 ;
77
+ const char * textures[WEAPON_NUM_TEXTURES] = { " default.bm " };
77
78
s32 xPos[WEAPON_NUM_TEXTURES] = { 0 };
78
79
s32 yPos[WEAPON_NUM_TEXTURES] = { 0 };
79
- s32* ammo = nullptr ;
80
+ s32* ammo = &TFE_DarkForces::s_playerInfo.ammoEnergy ;
80
81
s32* secondaryAmmo = nullptr ;
81
82
s32 wakeupRange = 0 ;
82
83
s32 variation = 0 ;
83
84
84
85
s32 primaryFireConsumption = 1 ;
85
86
s32 secondaryFireConsumption = 1 ;
86
87
87
- s32 numAnimFrames = 0 ;
88
+ s32 numAnimFrames = 1 ;
88
89
WeaponAnimFrame animFrames[WEAPON_NUM_ANIMFRAMES];
89
- s32 numSecondaryAnimFrames = 0 ;
90
+ s32 numSecondaryAnimFrames = 1 ;
90
91
WeaponAnimFrame animFramesSecondary[WEAPON_NUM_ANIMFRAMES];
91
92
};
92
93
You can’t perform that action at this time.
0 commit comments