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
1,061 Commits 9 Branches 6 Tags
2cbc52e265a2a6c504c446828a4c9e921de9f33d
T
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
Wanne 2cbc52e265 - Fixed "out of memory" crash when loading a savegame with NIV and the wrong "Items.xml" files 
o In my case the ja2 process took ALL the memory (up to 2GB) and then crashed
o The problem is, that the "objectStack.resize(size);" consumes ALL the memory when passing in invalid huge size to the resize method
o The wrong "size" is calculated from the temporary files because of wrong items. Now I added a safety check on the size variable and if out of range ( > 1000) we simply fail loading the savegame instead of letting the ja2 process consume all the memory and then let it crash after a few minutes.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4532 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-06-25 09:53:40 +00:00
Console
****************************************************************************
2011-05-26 11:04:47 +00:00
Editor
****************************************************************************
2011-05-26 11:04:47 +00:00
ext
- Removed unused old files
2011-06-17 10:56:48 +00:00
Laptop
BUGZILLA #539: Formatting of "No funds available" output screwed due to tab char
2011-06-21 13:03:56 +00:00
lua
****************************************************************************
2011-05-26 11:04:47 +00:00
Multiplayer
- Multiplayer Updates:
2011-06-22 21:20:38 +00:00
Res
Fixed Compiler Error: Replaced "#include afxres.h" with "#include "windows.h" in Res\ja2.rc, because it did not compile on a few machines.
2009-05-08 13:34:29 +00:00
Standard Gaming Platform
****************************************************************************
2011-05-26 11:04:47 +00:00
Strategic
BUGFIX 523 - When retreating from combat, the code was designed to add 5 minutes to the game clock. Not sure why. Possibly to resolve an exploit? Anyway, if another travel group had an arrival time within that 5 minute span, an Assertion error would result. This fixes that by removing the 5 minute "retreat charge".
2011-06-14 14:43:30 +00:00
Tactical
BUGFIX 538 - Added a condition so that if a door is not openable, iChance will be reset to 0 in time for the merc to make the "this is impossible" speech.
2011-06-21 16:54:24 +00:00
TacticalAI
- Bugfix: Improved previous Bugfix
2011-06-20 21:37:54 +00:00
TileEngine
****************************************************************************
2011-05-26 11:04:47 +00:00
Utils
Translated new line in Russian lang
2011-06-22 05:27:21 +00:00
aniviewscreen.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
binkw32.lib
************************************************************
2011-01-18 09:11:09 +00:00
builddefines.h
************************************************************
2011-01-18 09:11:09 +00:00
Cheats.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
Credits.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Credits.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Fade Screen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
Fade Screen.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
fmodvc.lib
*********************************************************
2006-04-26 23:41:05 +00:00
GameInitOptionsScreen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
GameInitOptionsScreen.h
************************************************************
2011-01-18 09:11:09 +00:00
gameloop.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
gameloop.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
gamescreen.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
gamescreen.h
New attack busy system
2007-06-09 09:01:04 +00:00
GameSettings.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
GameSettings.h
****************************************************************************
2011-05-26 11:04:47 +00:00
GameVersion.cpp
*** Hotfix: Build 4462 ***
2011-05-30 02:31:51 +00:00
GameVersion.h
- Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are
2011-06-06 19:04:56 +00:00
German.vsprops
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
HelpScreen.cpp
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
HelpScreen.h
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
HelpScreenText.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Init.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Init.h
****************************************************************************
2011-05-26 11:04:47 +00:00
Intro.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
Intro.h
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_Debug.props
************************************************************
2011-01-18 09:11:09 +00:00
ja2_Debug.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_Editor.props
************************************************************
2011-01-18 09:11:09 +00:00
ja2_Editor.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_Libs.props
************************************************************
2011-01-18 09:11:09 +00:00
ja2_Libs.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_LinkerVS2005.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_LinkerVS2008.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_LinkerVS2010.props
************************************************************
2011-01-18 09:11:09 +00:00
ja2_VS2005.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2005.vcproj
- Official Spring 2011 Release Build: 4452
2011-05-27 10:26:04 +00:00
ja2_VS2005Linker.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
ja2_VS2008.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2008.vcproj
- Changed output name to match language selection
2011-05-30 02:39:13 +00:00
ja2_VS2008.vsprops
**********************************************************
2010-02-28 18:38:52 +00:00
ja2_VS2008Debug.vsprops
Updated VS 2008 Project Files (thx to BirdFlu)
2008-12-10 20:57:37 +00:00
ja2_VS2008Editor.vsprops
Updated VS 2008 Project Files (thx to BirdFlu)
2008-12-10 20:57:37 +00:00
ja2_VS2008Libs.vsprops
VS 2008 project files update
2008-12-12 20:21:32 +00:00
ja2_VS2008Linker.vsprops
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
ja2_VS2010.sln
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2010.vcxproj
****************************************************************************
2011-05-26 11:04:47 +00:00
ja2_VS2010.vcxproj.filters
************************************************************
2011-01-18 09:11:09 +00:00
ja2.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
ja2.props
************************************************************
2011-01-18 09:11:09 +00:00
ja2.vsprops
************************************************************
2011-01-18 09:11:09 +00:00
JA2 All.h
New attack busy system
2007-06-09 09:01:04 +00:00
JA2 Demo Ads.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
JA2 Splash.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
JA2 Splash.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
JA2Prototypes.h
Fix memory leaks in strategic pathing
2007-10-20 08:40:25 +00:00
jascreens.cpp
************************************************************
2011-01-18 09:11:09 +00:00
jascreens.h
************************************************************
2011-01-18 09:11:09 +00:00
Language Defines.cpp
- Added Chinese language support (thx to Noword from TBS)
2008-11-20 07:43:57 +00:00
Language Defines.h
****************************************************************************
2011-05-26 11:04:47 +00:00
libexpatMT.lib
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
Loading Screen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
Loading Screen.h
************************************************************
2011-01-18 09:11:09 +00:00
local.h
- removed loading of unused ja2_logo.STI
2009-08-30 10:11:36 +00:00
lua51.lib
Added Overhaul's Lua lib to the project. Now it works without Lua51.dll
2007-06-20 19:11:58 +00:00
lua51.vc9.lib
Updated VS 2008 Project Files (thx to BirdFlu)
2008-12-10 20:57:37 +00:00
MainMenuScreen.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
mainmenuscreen.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MessageBoxScreen.cpp
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MessageBoxScreen.h
Merged Multiplayer UI patch from Zathras:
2009-03-19 15:31:55 +00:00
MPChatScreen.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
MPChatScreen.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MPConnectScreen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
MPConnectScreen.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
MPHostScreen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
MPHostScreen.h
Merged Multiplayer UI patch from Zathras:
2009-03-19 15:31:55 +00:00
MPJoinScreen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
MPJoinScreen.h
************************************************************
2011-01-18 09:11:09 +00:00
MPScoreScreen.cpp
- Multiplayer Updates:
2011-06-22 21:20:38 +00:00
MPScoreScreen.h
Merged Multiplayer UI patch from Zathras:
2009-03-19 15:31:55 +00:00
MPXmlTeams.cpp
****************************************************************************
2011-05-26 11:04:47 +00:00
MPXmlTeams.hpp
**********************************************************
2010-02-28 18:38:52 +00:00
mss32.lib
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Options Screen.cpp
BUGFIX 501 - portraits weren't being re-initialized when changing the TOPTION_SHOW_TACTICAL_FACE_ICONS parameter.
2011-06-07 16:30:51 +00:00
Options Screen.h
Merged Multiplayer UI patch from Zathras:
2009-03-19 15:31:55 +00:00
Path Debug.vsprops
Added profiler support
2007-10-20 06:56:34 +00:00
profiler.cpp
Added profiler support
2007-10-20 06:56:34 +00:00
profiler.h
Added profiler support
2007-10-20 06:56:34 +00:00
Roof Debug.vsprops
Added profiler support
2007-10-20 06:56:34 +00:00
Russian.vsprops
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
SaveLoadGame.cpp
- Fixed "out of memory" crash when loading a savegame with NIV and the wrong "Items.xml" files
2011-06-25 09:53:40 +00:00
SaveLoadGame.h
************************************************************
2011-01-18 09:11:09 +00:00
SaveLoadScreen.cpp
************************************************************
2011-01-18 09:11:09 +00:00
SaveLoadScreen.h
************************************************************
2011-01-18 09:11:09 +00:00
screenids.h
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
SCREENS.cpp
*** Merged Code from Multiplayer Branch Revision 2960 ***
2009-06-04 21:01:45 +00:00
SCREENS.H
Merged New Inventory Project into main branch
2008-03-08 15:15:25 +00:00
SMACKW32.LIB
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
Sys Globals.cpp
- Fixes/Improvements to Option screen (by Arynn)
2009-04-10 10:36:08 +00:00
Sys Globals.h
- Fixes/Improvements to Option screen (by Arynn)
2009-04-10 10:36:08 +00:00
VtuneApi.h
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
VtuneApi.lib
Original Source for 1.13 Mod High Resolution version from 12/06/05
2006-04-19 11:32:51 +00:00
S
Description
No description provided
57 MiB
Languages
C++ 90.4%
C 9.3%
HTML 0.2%
CMake 0.1%