tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Implemented M3, P228

This commit is contained in:
Marco Hladik 2016-12-01 20:37:11 +01:00
parent 7dcb352e9a
commit 88091a51a1
6 changed files with 826 additions and 4518 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

380
Source/Client/fteqcc.log Normal file
View File

@ -0,0 +1,380 @@
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
../Shared/WeaponP228.c:53: error: redeclaration of function body
../Shared/WeaponM3.c:55: const void() WeaponP228_Draw is defined here
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
************ ERROR ************
Errors have occured
Error in ../Shared/WeaponP228.c on line 53
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
Outputfile: ../../Main/csprogs.dat
including ../Builtins.h
including ../Globals.h
including Defs.h
including ../Shared/WeaponAK47.c
including ../Shared/WeaponAUG.c
including ../Shared/WeaponAWP.c
including ../Shared/WeaponDeagle.c
including ../Shared/WeaponElites.c
including ../Shared/WeaponFiveSeven.c
including ../Shared/WeaponG3SG1.c
including ../Shared/WeaponGlock18.c
including ../Shared/WeaponM3.c
including ../Shared/WeaponM4A1.c
including ../Shared/WeaponMac10.c
including ../Shared/WeaponMP5.c
including ../Shared/WeaponP228.c
including ../Shared/WeaponP90.c
including ../Shared/WeaponPara.c
including ../Shared/WeaponScout.c
including ../Shared/WeaponSG550.c
including ../Shared/WeaponSG552.c
including ../Shared/WeaponTMP.c
including ../Shared/WeaponUMP45.c
including ../Shared/WeaponUSP45.c
including ../Shared/WeaponXM1014.c
including ../Shared/WeaponBase.c
including ../Shared/Weapons.c
including View.c
including VGUI_Objects.c
including VGUI_MOTD.c
including VGUI_BuyMenu.c
including VGUI_TeamSelect.c
including VGUI.c
including HUD.c
including Draw.c
including Sound.c
in function CSQC_Event_Sound (line 21),
Sound.c:23: warning Q206: CSQC_Event_Sound: not all control paths return a value
including Entities.c
including Event.c
including Init.c
Compile finished: ../../Main/csprogs.dat (fte format)
Done. 1 warnings

4800
Source/Server/fteqcc.log
View File

File diff suppressed because it is too large Load Diff

87
Source/Shared/WeaponM3.c
View File

@ -20,6 +20,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
.int iClip_M3;
#ifdef QWSSQC
.int iMode_M3;
#else
int iWeaponMode_M3;
#endif
// Weapon Info
weaponinfo_t wptM3 = {
WEAPON_M3, // Identifier
@ -39,3 +45,84 @@ weaponinfo_t wptM3 = {
iAmmo_BUCKSHOT, // Caliber Pointer
iClip_M3 // Clip Pointer
};
// Anim Table
enum {
ANIM_M3_IDLE,
ANIM_M3_SHOOT1,
ANIM_M3_SHOOT2,
ANIM_M3_INSERT,
ANIM_M3_RELOAD,
ANIM_M3_RELOAD_END,
ANIM_M3_RELOAD_START,
ANIM_M3_DRAW
};
void WeaponM3_Draw( void ) {
#ifdef QWSSQC
OpenCSGunBase_Draw();
sound( self, CHAN_WEAPON, "weapons/m3_pump.wav", 1, ATTN_IDLE ); // TODO: Move to the client...?
#else
View_PlayAnimation( ANIM_M3_DRAW );
#endif
}
void WeaponM3_PrimaryFire( void ) {
#ifdef QWSSQC
if ( OpenCSGunBase_PrimaryFire() == TRUE ) {
sound( self, CHAN_WEAPON, "weapons/m3-1.wav", 1, ATTN_NORM );
}
#else
if ( random() <= 0.5 ) {
View_PlayAnimation( ANIM_M3_SHOOT1 );
} else {
View_PlayAnimation( ANIM_M3_SHOOT2 );
}
#endif
}
void WeaponM3_Reload( void);
void WeaponM3_Secondary( void ) {
#ifdef QWSSQC
// If it's full or no ammo is left...
if ( (self.(wptM3.iClipfld) == wptM3.iClipSize) || ( self.(wptM3.iCaliberfld) <= 0 ) ) {
WeaponM3_Reload();
return;
}
self.(wptM3.iClipfld) += 1;
self.(wptM3.iCaliberfld) -= 1;
Client_SendEvent( self, EV_WEAPON_SECONDARYATTACK );
#else
View_PlayAnimation( ANIM_M3_RELOAD );
#endif
}
void WeaponM3_Reload( void ) {
#ifdef QWSSQC
if ( OpenCSGunBase_Reload() == TRUE ) {
// Can we reload the gun even if we wanted to?
if ( !(self.(wptM3.iClipfld) == 0 && self.(wptM3.iCaliberfld) > 0) ) {
return;
}
self.iMode_M3 = 1 - self.iMode_M3;
if ( self.iMode_M3 == TRUE ) {
self.think = WeaponM3_Secondary;
self.nextthink = time + 0.8;
}
Client_SendEvent( self, EV_WEAPON_RELOAD );
}
#else
iWeaponMode_M3 = 1 - iWeaponMode_M3;
if ( iWeaponMode_M3 == 0 ) {
View_PlayAnimation( ANIM_M3_RELOAD_START );
} else {
View_PlayAnimation( ANIM_M3_RELOAD_END );
}
#endif
}

54
Source/Shared/WeaponP228.c
View File

@ -39,3 +39,57 @@ weaponinfo_t wptP228 = {
iAmmo_357SIG, // Caliber Pointer
iClip_P228 // Clip Pointer
};
// Anim Table
enum {
ANIM_P228_IDLE,
ANIM_P228_SHOOT1,
ANIM_P228_SHOOT2,
ANIM_P228_SHOOT3,
ANIM_P228_SHOOT_EMPTY,
ANIM_P228_RELOAD,
ANIM_P228_DRAW
};
void WeaponP228_Draw( void ) {
#ifdef QWSSQC
OpenCSGunBase_Draw();
sound( self, CHAN_WEAPON, "weapons/p228_slidepull.wav", 1, ATTN_IDLE ); // TODO: Move to the client...?
#else
View_PlayAnimation( ANIM_P228_DRAW );
#endif
}
void WeaponP228_PrimaryFire( void ) {
#ifdef QWSSQC
if ( OpenCSGunBase_PrimaryFire() == TRUE ) {
// Play Sound
sound( self, CHAN_WEAPON, "weapons/p228-1.wav", 1, ATTN_NORM );
}
#else
if ( getstatf( STAT_CURRENT_CLIP ) == 0 ) {
View_PlayAnimation( ANIM_P228_SHOOT_EMPTY );
} else {
int iRand = ceil( random() * 3 );
if ( iRand == 1 ) {
View_PlayAnimation( ANIM_P228_SHOOT1 );
} else if ( iRand == 2 ) {
View_PlayAnimation( ANIM_P228_SHOOT2 );
} else {
View_PlayAnimation( ANIM_P228_SHOOT3 );
}
}
#endif
}
void WeaponP228_Reload( void ) {
#ifdef QWSSQC
if ( OpenCSGunBase_Reload() == TRUE ) {
// Play Sound
}
#else
View_PlayAnimation( ANIM_P228_RELOAD );
#endif
}

9
Source/Shared/Weapons.c
View File

@ -25,11 +25,11 @@ weaponfunc_t wpnFuncTable[ CS_WEAPON_COUNT ] = {
{ Temp_Nothing, Temp_Nothing, Temp_Nothing, Temp_Nothing },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, WeaponUSP45_Secondary, WeaponUSP45_Reload },
{ WeaponGLOCK18_Draw, WeaponGLOCK18_PrimaryFire, WeaponGLOCK18_Secondary, WeaponGLOCK18_Reload },
{ WeaponDEAGLE_Draw, WeaponDEAGLE_PrimaryFire, Temp_Nothing, WeaponDEAGLE_Reload },
{ WeaponP228_Draw, WeaponP228_PrimaryFire, Temp_Nothing, WeaponP228_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponFIVESEVEN_Draw, WeaponFIVESEVEN_PrimaryFire, Temp_Nothing, WeaponFIVESEVEN_Reload },
{ WeaponM3_Draw, WeaponM3_PrimaryFire, Temp_Nothing, WeaponM3_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
{ WeaponUSP45_Draw, WeaponUSP45_PrimaryFire, Temp_Nothing, WeaponUSP45_Reload },
@ -121,6 +121,7 @@ void Weapon_GiveAmmo( float fWeapon, float fAmount ) {
void CSEv_GamePlayerBuy_f( float fWeapon ) {
Weapon_AddItem( fWeapon );
self.fMoney -= wptTable[ fWeapon ].iPrice;
self.fAttackFinished = time + 1.0;
}
#endif

14
Source/Shared/fteqcc.log Normal file
View File

@ -0,0 +1,14 @@
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
************ ERROR ************
Couldn't open file progs.src
Error in cmdline on line 0
Args: fteqcc
FTEQCC: Nov 11 2016
Source file: progs.src
************ ERROR ************
Couldn't open file progs.src
Error in cmdline on line 0