asarium
154a50028b
Make this Assert a little more informative
2015-11-18 18:43:19 +01:00
niffiwan
2c8d921d64
Change Assert to Error
...
This seems to be a data error rather than a coding error. Also provide
the user with more info to assist with tracking down the source of the
problem.
2015-11-08 13:04:13 +10:00
m!m
fbc9ede423
Merge pull request #398 from Goober5000/g3_const
...
const-correctness inspired by #392 , because why not be masochistic
2015-11-06 16:51:32 +01:00
Goober5000
14eec21c68
Merge pull request #384 from The-E/mc_info_constructor
...
Better handling for mc_info
2015-10-28 08:48:57 -04:00
Fabian Woltermann
0a08b6348b
Revert "Removes inline keyword from mc_info_init declaration"
...
This reverts commit c789b117cf
2015-10-28 09:19:21 +01:00
Fabian Woltermann
c789b117cf
Removes inline keyword from mc_info_init declaration
2015-10-28 08:54:03 +01:00
Goober5000
75411d92bb
const-correctness inspired by 392, because why not be masochistic
2015-10-27 22:46:35 -04:00
Fabian Woltermann
630ab5a3cc
Makes sure mc_info_init sets everything to safe data.
2015-10-27 08:24:06 +01:00
Fabian Woltermann
e28640ded0
Revert "Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset."
...
This reverts commit 35e34ac97c
2015-10-27 08:15:45 +01:00
The E
35e34ac97c
Introduces a proper constructor for mc_info and removes the mc_info_init function on grounds of grave misuse of memset.
2015-10-24 09:58:38 +02:00
asarium
1d2153794c
Fix an overflow warning
...
Signed overflow is not well defined in the standard but unsinged it so now that is used to determine if the model index counter has overflown.
2015-10-14 17:45:46 +02:00
Goober5000
b2215ddf7d
the model filename is useful to have in the debug message
2015-08-24 12:59:15 -04:00
Lari Nieminen
00fa839d1d
Added a few comments and fixed typos in some others
2015-08-22 21:55:37 +03:00
MageKing17
64c9b272e7
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/pilotfile/pilotfile.cpp
2015-08-19 11:53:25 -07:00
asarium
1cd7744d34
Fix "operator '?:' has lower precedence" warning
...
I think the ?: expression was meant to take precedence
2015-08-19 11:26:30 +02:00
asarium
9cbf944dee
Fix format warning in modelread.cpp
2015-08-19 11:26:28 +02:00
asarium
f00af4d89f
Fix "declaration of ‘i’ shadows a previous local" warning
2015-08-19 11:26:25 +02:00
Goober5000
bd3cd7eb18
Merge pull request #195 from Echelon9/fix/sort-uniq-includes
...
Review and refactor #include's
2015-08-19 00:05:02 -04:00
MageKing17
6985b198ec
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-12 13:25:34 -07:00
Echelon9
8160cd40dc
Change s/Error code/Error message/ in parse_glowpoint_table()
2015-08-06 17:54:41 +10:00
MageKing17
dc80ae0c9a
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-08-06 00:25:42 -07:00
Echelon9
aee7ee6322
Fix: warning: format ‘%d’ expects argument of type ‘int’, but argument 3 has type ‘const char*’ [-Wformat=]
2015-08-05 20:57:21 +10:00
Lari Nieminen
1bf86532fe
Added $Collision LOD ship table property, for using a LOD for collision detection
2015-08-03 13:20:14 +03:00
The E
0450ce7621
Make this assertion in modelanim a bit more useful.
2015-07-31 22:25:25 +02:00
DahBlount
688baa2bb6
Turret Ammo Implementation
...
This creates the foundation of turret ammo through the "turret use ammo" subsystem flag. Turret ammo works in the same manner as ship ammo, where the ammo is equal to bank capacity divided by the cargo size of the weapon. This was tested using the Blue Planet: War in Heaven mod.
Test case: UEFg Narayana turrets 19 through 21, all of which contain Apocalypse torpedos with a $Cargo Size: of 2.5, were changed to use ammo with a $SBank Capacity of 20, resulting in a total ammo capacity of 8 torpedos. The Narayana was ordered to attack a GTCv Diomedes; it fired 8 torpedos each from turrets 19 through 21 before stopping. The mission was left to proceed for an additional 2 minutes, in which time the Narayana did not fire any more torpedos. Note: The Apocalypse takes 20 seconds to fire each 4 torpedo burst.
Conclusion: Success
2015-07-28 12:32:08 -05:00
Echelon9
3e8278d698
Fix: model/modelread.cpp: warning: variable ‘flags’ set but not used [-Wunused-but-set-variable]
2015-07-11 22:47:25 +10:00
Echelon9
37cf848f51
Fix: model/modelrender.cpp:2898:9: warning: declaration of ‘view_pos’ shadows a previous local [-Wshadow]
2015-07-11 22:36:42 +10:00
Echelon9
053ae6d287
Fix: modelrender.h:86:7: warning: ‘model_render_params::Replacement_textures’ will be initialized after [-Wreorder]
2015-07-11 21:28:01 +10:00
Echelon9
3acc777afe
Fix: model/modelread.cpp: warning: declaration of ‘ship_obj’ shadows a global declaration [-Wshadow]
2015-07-06 23:40:12 +10:00
Echelon9
85a0bda946
Fix: model/modelanim.cpp:536:78: warning: declaration of ‘anim’ shadows a global declaration [-Wshadow]
2015-07-06 20:54:14 +10:00
Echelon9
66257146b7
Fix: model/modelcollide.cpp:1215:36: warning: declaration of ‘mc_info’ shadows a global declaration [-Wshadow]
2015-07-06 19:40:21 +10:00
Echelon9
60d1234abd
Fix: model/modelread.cpp:270:12: warning: declaration of ‘i’ shadows a previous local [-Wshadow]
2015-07-05 17:13:01 +10:00
Echelon9
2bac9ba5fa
Fix: model/modelrender.cpp:780:55: warning: declaration of ‘color’ shadows a global declaration [-Wshadow]
2015-07-05 17:07:39 +10:00
Echelon9
6618165926
Fix: model/modelinterp.cpp:4342:14: warning: declaration of ‘j’ shadows a previous local [-Wshadow]
2015-07-05 00:59:13 +10:00
Echelon9
6950c69ebb
Fix: model/modelinterp.cpp:2034:44: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:54:29 +10:00
Echelon9
b8ff93dad2
Fix: model/modelinterp.cpp:2603:43: warning: declaration of ‘gpoi’ shadows a previous local [-Wshadow]
2015-07-05 00:52:39 +10:00
Echelon9
182b297af4
Fix: model/modelrender.cpp:2560:10: warning: variable ‘objp’ set but not used [-Wunused-but-set-variable]
2015-07-05 00:30:34 +10:00
Echelon9
fff2d5280c
Fix: model/modelrender.cpp:2560:8: warning: variable ‘shipp’ set but not used [-Wunused-but-set-variable]
2015-07-04 16:18:38 +10:00
Fabian Woltermann
6a0e550aac
Revert "Fix Coverity 1298257: Uninitialized scalar var"
2015-06-28 13:59:13 +02:00
Fabian Woltermann
150a00a17a
Merge pull request #209 from ln-zookeeper/master
...
Fixes and enhancements for detail boxes and spheres
2015-06-27 11:43:56 +02:00
Fabian Woltermann
bdf844fc83
Merge pull request #113 from niffiwan/coverity/1298257
...
Fix Coverity 1298257: Uninitialized scalar var
2015-06-27 11:28:19 +02:00
Lari Nieminen
e0605f125c
Merge branch 'master' of https://github.com/scp-fs2open/fs2open.github.com
2015-06-25 13:07:41 +03:00
Echelon9
2ca1f40d98
Avoid shadowed declaration of previous local 'gpoi'
2015-06-25 17:20:10 +12:00
Lari Nieminen
fc9acb3a4d
Added support for detail box $box_offset.
2015-06-24 00:48:07 +03:00
Lari Nieminen
2e012969e7
Fixed detail sphere $offset not working right.
2015-06-24 00:44:13 +03:00
Lari Nieminen
84b7a06a44
Restored ability to combine detail boxes and spheres.
2015-06-23 19:53:18 +03:00
Lari Nieminen
8fd09be8a0
Replaced the static Interp_render_* variables with normal local ones.
2015-06-23 19:50:17 +03:00
Echelon9
2b251e3cb3
Simplify duplicative model/ includes.
2015-06-22 20:24:31 +10:00
Echelon9
c5493bb480
Scripted sort and uniq on (internal) project includes. Improves search time and as a by product removed a number of duplicative includes.
2015-06-22 20:24:30 +10:00
MageKing17
ab9d2e20fb
Merge branch 'master' of ssh://github.com/scp-fs2open/fs2open.github.com into ship_info
...
Conflicts:
code/ship/ship.cpp
2015-06-18 14:40:53 -07:00
asarium