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
540 Commits 9 Branches 6 Tags
9d71fc89f0804a125214a01447ecfaad2a23469b
Commit Graph
540 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Overhaul d8145755c3 Added window around windowed JA2 
Replaced Windows console with freeware console implementation.  Activate in windowed mode with \
Added error and quit if JA2 started in window mode in >16bpp color depth
Fix to enemy sector investigation:  Was deducting from redshirts when elites investigated
Fix AWOL militia (need additional fix to prevent them from being redistributed during after reinforcements)
Fix to tanks to add them in their original spot when a new one cannot be found.  Should modify to remove old wreckage in this case.
AI no longer tries to fire mortar when no room for it
Tanks no longer try to throw knives


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-08 07:02:56 +00:00
lalien 45b0868ace - fixed: shift-R (autoreload) doesnt check if the ammo is accesible/visible 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-04 22:04:12 +00:00
lalien 5102293774 - reverted resource.h for VS 6/2003 compatibility 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-07-01 20:48:33 +00:00
lalien 6cf3fbbe5a - added new militia control command 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-29 21:19:11 +00:00
lalien 6590737dde Changed minimum log message size to 10 characters to prevent commits with empty log messages. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-29 14:13:41 +00:00
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
Wanne dc441a425d Added Overhaul's Lua lib to the project. Now it works without Lua51.dll 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-20 19:11:58 +00:00
SpaceViking 2cd3521e3f Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 03:05:04 +00:00
SpaceViking ac41de3515 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 03:01:57 +00:00
SpaceViking 2b59950880 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 03:00:15 +00:00
SpaceViking 1ff6f798c3 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 02:57:50 +00:00
SpaceViking d24bb86686 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 02:57:16 +00:00
SpaceViking 183ee2005f Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 02:56:45 +00:00
SpaceViking 88b9b38bd6 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-15 02:56:15 +00:00
Wanne 4d51fbcdd9 PROJECT CHANGES (already done for VS 2003): 
- Changed "Runtime Library" from "lua" project to "Multi-threaded Debug (/MTd)" so we get rid of "Linker Warning LNK4098" in project "ja2"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 19:42:03 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003): 
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 18:48:46 +00:00
lalien e78b4ea242 - fix for Russian version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 15:47:03 +00:00
lalien 5299427465 - added project and lib files for Lua 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 13:58:34 +00:00
Wanne 74cd6a21f3 Reverted 2 lines in Tactical/ShopKeeper Interface.cpp, because it did not compile in VS 2003 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 13:44:36 +00:00
lalien 639987007d - renamed lib file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 13:36:34 +00:00
Overhaul 611205b8f6 Corrected LUA console define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@928 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2007-06-10 08:48:01 +00:00