1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
561 Commits 9 Branches 6 Tags
d5d3294024f602cd160e692b5a36fa2bdf1e8fd3
Commit Graph
561 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lalien d5d3294024 - added range check for light sprites 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1143 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-08-01 10:15:43 +00:00
Overhaul b07d18f9f4 Editor: Disable light sprites that are not in bounds. Actually happens in some sectors (ie Drassen) 
Editor:  Fix for use of uninitialized variable in undo
Editor:  Fix for clipping bounds that are offscreen (causes crash)
Fix for AP bonus reading from INI
Fix mine indexes when looking for creature infestation of mines
Final (?) fix for militia reinforcements.  Also a change:  If you refuse reinforcements, none will come for the entirety of the battle
Increase size of cover and LOS grids to fit max radius
Fix for uninitialized light level in DistanceVisible
Move CheckForEndOfBattle to end of ReduceAttackBusy, to remove a possible militia invalidate upon promotion
Change the way Alt-L handles reloading


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1142 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-08-01 08:58:34 +00:00
AalaarDB 99358cf103 Uploaded the wrong file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-31 22:45:34 +00:00
AalaarDB db11a44df7 Fix for incorrect, sometimes negative, values of items sold to locals 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1140 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-31 20:15:02 +00:00
Overhaul c462fd7744 More detailed error messages for failed saves 
Yet another phantom militia fix

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-26 05:26:38 +00:00
SpaceViking 3e997fa0e1 Don't have monster spit cause fiery explosions 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-25 12:41:40 +00:00
Overhaul 3b4f77b012 Fix problems with missing tile effect in places such as Alma and Tixa underground 
Also fixes potential problem with buffer overruns


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1115 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-25 09:24:27 +00:00
Overhaul b24712f2b6 Fix sticky keys due to loading screens 
Fix infinite loop/hang after an assertion failure

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1113 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-25 04:44:58 +00:00
Overhaul b559e8601d Removed an inconsistency between quickload and regular load 
Turned on heap checking for debug builds.  *Could cause memory to run low if game runs for extended periods
Fixed assertion message for case where soldier groups try to cross impassible terrain
Fixed inventory memory leak


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1110 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-24 09:14:56 +00:00
SpaceViking 48527d4aa5 Fix problem with items with default attachments not comparing to base items correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-24 06:44:11 +00:00
Overhaul ec8efcadea Added a missing header 
SGP_DEBUG is now exclusively for outputting huge amounts of debug info, made consistent in DEBUG.cpp
Fix for slow bullets and other anims

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-22 19:33:36 +00:00
lalien 4b42b95a8c - fixed memory leak in new inventory 
- fixed some variables not being initialized
- fixed swapped parameter in LOS.cpp
- added variable range check in lighting.cpp, the cause of wrong index value still not fixed

 


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-22 01:09:21 +00:00
lalien ab1419fab4 - added function declaration 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1092 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-21 11:51:15 +00:00
Overhaul b7859a710f Efficiency improvements for soldier->soldier sighting 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1091 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-21 08:10:00 +00:00
lalien 9e92cefbfa - fixed some variables not being initialized 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1089 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-20 18:16:54 +00:00
Wanne cdedbe8375 New Release Build (1080): The Release build contains all the changes including revision 1079!!! 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1082 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-20 10:36:03 +00:00
Overhaul 5231251b57 Fix squad oversizing based on user prefs 
Fix militia issue in auto-resolve:  Militia were not always being promoted even when it said they were.  Since first X slots are for militia already in the sector, militia from other sectors are not sorted by rank.  This actually affects battle outcome!
Added fix to editor to skip cached tiles in RaiseWorldLand.  Otherwise it can crash when invoked within the game.

ja2_2005Express projects:
Added output directory for JA2 exe based on environment variable JA2GAMEPATH
Restored editor built by default for debug mode


Removed #define LUA_CONSOLE.  It is no longer relevant.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1081 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-20 10:12:43 +00:00
lalien 12e6655e29 - new shortcut: Ctrl+Del in sector inventory deletes all items in sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1080 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-20 08:03:23 +00:00
lalien 8af1e04895 - added include dirs for debug config 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-20 07:03:46 +00:00
lalien 429ca31658 - fixed Ctrl+M not moving items from/to the roof 
- fixed Ctrl+S, Ctrl+F, Ctrl+M, Ctrl+R affect not visible items

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-19 14:29:05 +00:00
lalien 610df320a5 - added Res include directory to Console.rc for VS 2003 project 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1077 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-19 12:16:55 +00:00
Overhaul 9d71fc89f0 Massive effort to reign in militia problem. Still has issues :( 
Fix:  If only some of mercs go to a lower level (mine, basement, etc) but do not choose to "GO TO SECTOR", sector is still inaccessible from strategic map.  However, watch for triggers that might happen on first visit to a sector, that fail.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1076 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-19 08:33:17 +00:00
Wanne e2fa801e2b - bugfix: Now game always starts at Day 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1075 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-19 08:03:07 +00:00
Wanne f1a166982a - bugfixes: Fixed two bugs in attacks.cpp, that AalaarDB posted in the Bears Pi 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1074 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-19 06:38:26 +00:00
Sergeant_Kolja 883557c87d fixed an issue in Fileprintf() with too short buffer for vsprintf. switched to more secure version vsnprintf() (that is, in fact avail since VS6 but not as secure as vsprintf_s()). 
Also inflated the buffer to fit the messages from XML-Writer code (is executed in debug mode only).
The inflation has nothing to do with the securing, its only for comfort of the XML writers log messages.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1071 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 20:18:02 +00:00
Sergeant_Kolja cab825a382 The Bug "pObject corrupted", aka "Toni SKI crash" or 6 Shuriken stacking crash" is triggered for debugging here, but only in _DEBUG build. In Release, nothing is changed. In _DEBUG, the code will DebugBreak() and if no Studio running, it will AsserMsg(). But this happens only if the corruption was _detected_. Not when it has happened :-( It is only a starting point for further excavation, and better than having nothing... 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1070 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 20:12:29 +00:00
Sergeant_Kolja c75026b151 Fixed two bugs: 
1st) Weight Overflow, mostly when calculating Weight of Creature Spit Ammo. This has no Ammo, so the old code calculated accidentally -1.6f, resulting in 0xFFFF integer

2nd) GetAttachmentComboMerge() improved. Now a base item can be merged with _different_ 2nd items to result in _different_ merges. Before, a base item was only able to be merged to _one_ result. F.I. if we want to make a Dart gun from Dart pistol by adding (a buttstock and) wheter a steel tube /or/ a Gun Barrel Extender, the old code wouldn't work for the Gun Barel Extender, since it would never been tested, if there is a Gun Barrel.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1069 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 19:59:25 +00:00
SpaceViking 38b853344f Initialize strings to avoid strcpy problems 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 04:37:44 +00:00
SpaceViking a778a657b9 Fixes for more structures not being initialized. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1065 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 03:07:12 +00:00
SpaceViking cec7853cf9 Fix bug where structure was not being initialized. This caused occasional crashes when dialog with text was displayed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-17 02:38:05 +00:00
Overhaul 3259e9fb1b Reverted much of the scrolling to rev.924 video.cpp. Fixes text while scrolling and also retains windowed mode fixes. 
Hide cursor after creating window instead of waiting for game to load.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-16 21:27:12 +00:00
Overhaul 46aa0b6220 Reverted a change in the scrolling code that caused text to scroll with the screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-16 11:15:02 +00:00
Overhaul 03dfd90060 Inscreased speed of window title bar resize for open/close function 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1060 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-16 03:45:41 +00:00
lalien e6ac001a61 - removed include dir 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1059 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 21:10:30 +00:00
Overhaul 8e75433dd1 Militia and friendly AI now mark mines for OUR side. 
Related to above, militia deadlock fixed
Crash if console hasn't been brought up when text is sent to it fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 20:34:43 +00:00
Wanne 14340ad8ea Updated Project configuration for Release Build with VS 2003 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1057 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 15:54:46 +00:00
Wanne 1dc2cb5bc7 Changed console project from multi thread debug to single thread debug, cause otherwise it does not compile 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 15:38:33 +00:00
Wanne 1f337d9d51 Updated project files, because they did not compile on my machine under VS 2003 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 15:23:16 +00:00
Wanne a95882d50a Some small editor changes for compilation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 13:13:00 +00:00
Wanne 089e08f202 Small fixes for compiling different language versions (German, Russian) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-15 11:12:27 +00:00
lalien ee6980bc5d - added console project for VS 2003 
- new shortcut: Ctrl+Y deletes all items of selected type from the sector inventory
- new shortcut: Alt+Y sells all items of selected type from the sector inventory






git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-14 13:51:39 +00:00
Overhaul 7384ae7268 Newly placed tanks now drag away old wreckage if present 
Console line input only backspaces to beginning of line

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-14 08:09:59 +00:00
Overhaul 99e45d697e Fix to make soldier continue towards destination if previous path ended with a special move 
Re-integrated LUA and console.  Still many things to finish though.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-14 04:25:07 +00:00
lalien 0c6b247cf5 - new shortcut: Shift+M moves all items in sector to location of selected merc 
- fix for array initialization


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-13 23:32:44 +00:00
Wanne 2ff5019247 Added possibility, that mod makers can add their credits and display them in the credits screen 
The new file is named "Credits_Mod.edt" and is located in the mod data folder\BinaryData
  If that file exists, the mod credits are displayed first, second the 1.13 credits and then the sir-tech credits.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-12 07:46:02 +00:00
Overhaul dcb990debf Fixed print screen for full-screen mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-10 06:13:44 +00:00
Overhaul ec4d1f6e24 Fix to stackable throwables: 
Stop assertion failure for stack of 6 throwables.  
Report correct damage and AP for stacked throwables.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-09 11:06:57 +00:00
Overhaul d318885593 Brute force to finally make militia show up when they're supposed to 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1035 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-09 08:58:56 +00:00
Overhaul 1bf50d65f4 Fixed a pathing issue where a soldier would sometimes jump the wrong fence 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-08 09:29:15 +00:00
Overhaul 6a9a39c096 Fixed animation deadlock when crouched soldier's final destination is to jump a fence. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-08 08:42:11 +00:00