1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-19 14:20:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ExtraMercs

Browse Source
This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
parent f3194718e4 4ec012ce7b
commit 82aca548f5
601 changed files with 4005 additions and 10278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Animated ProgressBar.cpp
+3 -3
View File
@@ -1,18 +1,18 @@
#include "types.h"
#include "Animated ProgressBar.h"
#include "MemMan.h"
#include "debug.h"
#include "DEBUG.H"
#include "Font Control.h"
#include "vsurface.h"
#include "video.h"
#include "Render Dirty.h"
#include "music control.h"
#include "Music Control.h"
#include "Timer Control.h"
#include "sysutil.h"
#include "random.h"
#include "math.h"
#include "WordWrap.h"
#include "Message.h"
#include "message.h"
#include "Text.h"
#include "Loading Screen.h"
Utils/Cinematics Bink.cpp
+7 -7
View File
@@ -1,4 +1,4 @@
#include "Types.h"
#include "types.h"
#include <stdio.h>
#include <io.h>
#include <string.h>
@@ -8,15 +8,15 @@
#include <malloc.h>
#include <stdlib.h>
#include "Debug.h"
#include "DEBUG.H"
#include "FileMan.h"
#include "smack.h"
#include "DDraw.h"
#include "mss.h"
#include "SMACK.H"
#include "ddraw.h"
#include "Mss.h"
#include "DirectX Common.h"
#include "DirectDraw Calls.h"
#include "SoundMan.h"
#include "Video.h"
#include "soundman.h"
#include "video.h"
#include "Cinematics Bink.h"
Utils/Cinematics.cpp
+2 -2
View File
@@ -11,7 +11,7 @@
//----------------------------------------------------------------------------------
//#include "LocalCodeAll.h"
#include "Types.h"
#include "types.h"
#include <stdio.h>
#include <io.h>
#include <string.h>
@@ -23,7 +23,7 @@
#include "DEBUG.H"
#include "FileMan.h"
#include "smack.h"
#include "SMACK.H"
#include "ddraw.h"
#include "DirectX Common.h"
#include "DirectDraw Calls.h"
Utils/Cinematics.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _CINEMATICS_H_
#define _CINEMATICS_H_
#include "smack.h"
#include "SMACK.H"
struct SMKFLIC
{
Utils/Cursors.cpp
+4 -4
View File
@@ -1,15 +1,15 @@
#include "builddefines.h"
#include <wchar.h>
#include "sgp.h"
#include "cursors.h"
#include "Cursors.h"
#include "Timer Control.h"
#include "jascreens.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "Sys Globals.h"
#include "Handle UI.h"
#include "interface.h"
#include "overhead.h"
#include "Interface.h"
#include "Overhead.h"
#include "Cursor Control.h"
#include "Sound Control.h"
// HEADROCK HAM B2.6: included this here to allow toggling the CTH bars.
Utils/Encrypted File.cpp
+2 -2
View File
@@ -1,9 +1,9 @@
#include "Encrypted File.h"
#include "FileMan.h"
#include "Debug.h"
#include "DEBUG.H"
// anv: for selecting random line
#include "Random.h"
#include "random.h"
// anv: loading random line from the file
BOOLEAN LoadEncryptedDataFromFileRandomLine(STR pFileName, STR16 pDestString, UINT32 uiSeekAmount)
Utils/Event Pump.cpp
+2 -2
View File
@@ -1,12 +1,12 @@
#include <stdio.h>
#include <time.h>
#include "sgp.h"
#include "wcheck.h"
#include "WCheck.h"
#include "Event Pump.h"
#include "Timer.h"
#include "Sound Control.h"
#include "Overhead.h"
#include "weapons.h"
#include "Weapons.h"
#include "Animation Control.h"
#include "opplist.h"
#include "Tactical Save.h"
Utils/Font Control.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "sgp.h"
#include "himage.h"
#include "vsurface.h"
#include "wcheck.h"
#include "WCheck.h"
#include "Font Control.h"
#include <language.hpp>
Utils/Font Control.h
+1 -1
View File
@@ -2,7 +2,7 @@
#define __FONT_CONTROL_H
#include "builddefines.h"
#include "font.h"
#include "Font.h"
extern BOOLEAN gfUseWinFonts;
extern INT32 giCurWinFont;
Utils/INIReader.cpp
+2 -2
View File
@@ -1,7 +1,7 @@
#include "builddefines.h"
#include "IniReader.h"
#include "INIReader.h"
#include "FileMan.h"
#include "debug.h"
#include "DEBUG.H"
#include "Font Control.h"
#include "message.h"
#include <stdio.h>
Utils/INIReader.h
+2 -2
View File
@@ -2,8 +2,8 @@
#define INIREADER_H
#define NOMINMAX
#include <algorithm>
#include <Windows.h>
#include <Types.h>
#include <windows.h>
#include <types.h>
#include <stack>
#include <string>
Utils/KeyMap.cpp
+1 -1
View File
@@ -1,6 +1,6 @@
#include "KeyMap.h"
#include <windows.h>
#include "text.h"
#include "Text.h"
static Str8EnumLookupType gKeyTable[] =
{
Utils/KeyMap.h
+1 -1
View File
@@ -1,4 +1,4 @@
#include <Types.h>
#include <types.h>
extern int ParseKeyString(const STR value);
extern BOOLEAN IsKeyPressed(int value);
Utils/MapUtility.cpp
+10 -10
View File
@@ -2,21 +2,21 @@
#ifdef JA2EDITOR
#include "Screens.h"
#include "Maputility.h"
#include "maputility.h"
#include "worlddef.h"
#include "overhead.h"
#include "fileman.h"
#include "loadscreen.h"
#include "Overhead.h"
#include "FileMan.h"
#include "LoadScreen.h"
#include "overhead map.h"
#include "radar screen.h"
#include "Radar Screen.h"
#include "vobject_blitters.h"
#include "sticonvert.h"
#include "font control.h"
#include "worlddat.h"
#include "STIConvert.h"
#include "Font Control.h"
#include "WorldDat.h"
#include "english.h"
#include "map information.h"
#include "Map Information.h"
#include "line.h"
#include "quantize wrap.h"
#include "Quantize Wrap.h"
//dnl ch77 131113
#include "Editor Taskbar Utils.h"
#include "Text Input.h"
Utils/MercTextBox.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include "Utilities.h"
#include "WordWrap.h"
#include "vobject_blitters.h"
#include "Message.h"
#include "message.h"
#define TEXT_POPUP_WINDOW_TEXT_OFFSET_X 8
Utils/MercTextBox.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __MERCTEXTBOX_H_
#define __MERCTEXTBOX_H_
#include "Types.h"
#include "types.h"
#define MERC_POPUP_PREPARE_FLAGS_TRANS_BACK 0x00000001
Utils/Multilingual Text Code Generator.cpp
+2 -2
View File
@@ -32,8 +32,8 @@ CREATED: Feb 16, 1999
#include "builddefines.h"
#include <stdio.h>
#include "types.h"
#include "debug.h"
#include "Fileman.h"
#include "DEBUG.H"
#include "FileMan.h"
//Currently in JA2's _EnglishText, these tokens make up all of the
//format specifiers that are actually used. Feel free to add more,
Utils/Music Control.cpp
+3 -3
View File
@@ -1,10 +1,10 @@
#include "types.h"
#include "Music Control.h"
#include "soundman.h"
#include "Random.h"
#include "random.h"
#include "jascreens.h"
#include "overhead.h"
#include "timer control.h"
#include "Overhead.h"
#include "Timer Control.h"
#include "strategicmap.h"
#include "Overhead Types.h"
Utils/STIConvert.cpp
+4 -4
View File
@@ -3,14 +3,14 @@
#include <stdlib.h>
#include <string.h>
#include "types.h"
#include "compression.h"
#include "debug.h"
#include "fileman.h"
#include "Compression.h"
#include "DEBUG.H"
#include "FileMan.h"
#include "imgfmt.h"
#include "himage.h"
#include "pcx.h"
#include "impTGA.h"
#include "wcheck.h"
#include "WCheck.h"
//CONVERT_TO_16_BIT
BOOLEAN ConvertToETRLE( UINT8 ** ppDest, UINT32 * puiDestLen, UINT8 ** ppSubImageBuffer, UINT16 * pusNumberOfSubImages, UINT8 * p8BPPBuffer, UINT16 usWidth, UINT16 usHeight, UINT32 fFlags );
Utils/Slider.cpp
+3 -3
View File
@@ -1,11 +1,11 @@
#include "Types.h"
#include "types.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Utilities.h"
#include "WCheck.h"
#include "Slider.h"
#include "SysUtil.h"
#include "Line.h"
#include "sysutil.h"
#include "line.h"
Utils/Sound Control.cpp
+2 -2
View File
@@ -3,8 +3,8 @@
#include "sgp.h"
#include "Sound Control.h"
#include "soundman.h"
#include "overhead.h"
#include "isometric utils.h"
#include "Overhead.h"
#include "Isometric Utils.h"
#include "renderworld.h"
#include "GameSettings.h"
#include "math.h"
Utils/Text Input.cpp
+3 -3
View File
@@ -4,12 +4,12 @@
#include <time.h>
#include <wchar.h>
#include "input.h"
#include "font.h"
#include "Font.h"
#include "english.h"
#include "vsurface.h"
#include "video.h"
#include "debug.h"
#include "cursors.h"
#include "DEBUG.H"
#include "Cursors.h"
#include "Text Input.h"
#include "Timer Control.h"
#include "vobject_blitters.h"
Utils/Text Utils.cpp
+2 -13
View File
@@ -1,5 +1,5 @@
#include "text.h"
#include "Fileman.h"
#include "Text.h"
#include "FileMan.h"
#include "GameSettings.h"
// sevenfm
#include <codecvt>
@@ -388,17 +388,6 @@ void ParseCommandLine (
++*numargs;
}
inline std::string narrow(std::wstring const& text)
{
std::locale const loc("");
wchar_t const* from = text.c_str();
std::size_t const len = text.size();
std::vector<char> buffer(len + 1);
std::use_facet<std::ctype<wchar_t> >(loc).narrow(from, from + len, '_', &buffer[0]);
return std::string(&buffer[0], &buffer[len]);
}
// convert UTF-8 string to wstring
std::wstring utf8_to_wstring(const std::string& str)
{
Utils/Timer Control.cpp
+4 -4
View File
@@ -2,14 +2,14 @@
#include <mmsystem.h>
#include <string.h>
#include "stdlib.h"
#include "debug.h"
#include "DEBUG.H"
#include "Timer Control.h"
#include "overhead.h"
#include "Overhead.h"
#include "handle items.h"
#include "worlddef.h"
#include "renderworld.h"
#include "interface control.h"
#include "keymap.h"
#include "Interface Control.h"
#include "KeyMap.h"
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
Utils/Utilities.cpp
+5 -5
View File
@@ -1,16 +1,16 @@
#include "types.h"
#include <stdio.h>
#include <Windows.h>
#include <windows.h>
#include "sgp.h"
#include "time.h"
#include "vobject.h"
#include "FileMan.h"
#include "Utilities.h"
#include "Font Control.h"
#include "overhead.h"
#include "overhead types.h"
#include "wcheck.h"
#include "sys globals.h"
#include "Overhead.h"
#include "Overhead Types.h"
#include "WCheck.h"
#include "Sys Globals.h"
extern BOOLEAN GetCDromDriveLetter( STR8 pString );
Utils/Utilities.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _UTILITIES_H_
#define _UTILITIES_H_
#include "Overhead types.h"
#include "Overhead Types.h"
#include "sgp.h"
Utils/Utils All.h
+27 -27
View File
@@ -6,22 +6,22 @@
#include "types.h"
#include "Animated ProgressBar.h"
#include "MemMan.h"
#include "debug.h"
#include "DEBUG.H"
#include "Font Control.h"
#include "vsurface.h"
#include "video.h"
#include "Render Dirty.h"
#include "music control.h"
#include "Music Control.h"
#include <wchar.h>
#include "sgp.h"
#include "cursors.h"
#include "Cursors.h"
#include "Timer Control.h"
#include "jascreens.h"
#include "font.h"
#include "Font.h"
#include "Sys Globals.h"
#include "Handle UI.h"
#include "interface.h"
#include "overhead.h"
#include "Interface.h"
#include "Overhead.h"
#include "Cursor Control.h"
#include "Debug Control.h"
#include "stdio.h"
@@ -30,64 +30,64 @@
#include <stdio.h>
#include <stdarg.h>
#include <time.h>
#include "wcheck.h"
#include "WCheck.h"
#include "Event Manager.h"
#include "Event Pump.h"
#include "Timer.h"
#include "Soldier Control.h"
#include "Sound Control.h"
#include "weapons.h"
#include "Weapons.h"
#include "Animation Control.h"
#include "opplist.h"
#include "himage.h"
#include "vsurface_private.h"
#include "text.h"
#include "Text.h"
#include "Screens.h"
#include "Maputility.h"
#include "maputility.h"
#include "worlddef.h"
#include "loadscreen.h"
#include "LoadScreen.h"
#include "overhead map.h"
#include "radar screen.h"
#include "Radar Screen.h"
#include "vobject_blitters.h"
#include "sticonvert.h"
#include "worlddat.h"
#include "STIConvert.h"
#include "WorldDat.h"
#include "english.h"
#include "map information.h"
#include "Map Information.h"
#include "line.h"
#include "MercTextBox.h"
#include "renderworld.h"
#include "Utilities.h"
#include "WordWrap.h"
#include "Message.h"
#include "message.h"
#include <memory.h>
#include "mbstring.h"
#include "local.h"
#include "Map Screen Interface Bottom.h"
#include "Soundman.h"
#include "BuildDefines.h"
#include "soundman.h"
#include "builddefines.h"
#include "Dialogue Control.h"
#include "Multi Language Graphic Utils.h"
#include "Random.h"
#include "random.h"
#include "gamescreen.h"
#include "Creature Spreading.h"
#include "strategicmap.h"
#include "fade screen.h"
#include "Fade Screen.h"
#include "PopUpBox.h"
#include "sysutil.h"
#include "phys math.h"
#include "Types.h"
#include "types.h"
#include "WordWrap.h"
#include "Render Dirty.h"
#include "Utilities.h"
#include "Cursors.h"
#include "WCheck.h"
#include "Slider.h"
#include "SysUtil.h"
#include "Line.h"
#include "isometric utils.h"
#include "sysutil.h"
#include "line.h"
#include "Isometric Utils.h"
#include <stdlib.h>
#include <string.h>
#include "compression.h"
#include "Compression.h"
#include "imgfmt.h"
#include "pcx.h"
#include "impTGA.h"
@@ -98,8 +98,8 @@
#include "handle items.h"
#include "time.h"
#include "vobject.h"
#include "overhead types.h"
#include "tactical save.h"
#include "Overhead Types.h"
#include "Tactical Save.h"
#include "KeyMap.h"
//#include <windows.h>
Utils/Win Util.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include <mmsystem.h>
#include <dsound.h>
#include "dsutil.h"
#include "debug.h"
#include "DEBUG.H"
#include "sgp.h"
Utils/WordWrap.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "sgp.h"
#include "Render Dirty.h"
#include "Font Control.h"
#include "Stdio.h"
#include "stdio.h"
#include "WinFont.h"
#include <language.hpp>
Utils/XMLAccess.cpp
+1 -1
View File
@@ -1,4 +1,4 @@
#include "Types.h"
#include "types.h"
#define WEAPONSFILENAME "TABLEDATA\\Weapons.dat"
#define MAX_CHAR_DATA_LENGTH 500
Utils/XMLProperties.cpp
+1 -1
View File
@@ -8,7 +8,7 @@
#include "XML_Parser.h"
#include "XMLWriter.h"
#include "Debug.h"
#include "DEBUG.H"
vfs::PropertyContainer::TagMap::TagMap()
{
Utils/XML_Items.cpp
+14 -14
View File
@@ -1,37 +1,37 @@
#include "sgp.h"
#include "overhead types.h"
#include "Overhead Types.h"
#include "Soldier Control.h"
#include "overhead.h"
#include "Overhead.h"
#include "Event Pump.h"
#include "weapons.h"
#include "Weapons.h"
#include "Animation Control.h"
#include "Handle UI.h"
#include "Isometric Utils.h"
#include "math.h"
#include "ai.h"
#include "los.h"
#include "LOS.h"
#include "renderworld.h"
#include "interface.h"
#include "Interface.h"
#include "message.h"
#include "campaign.h"
#include "items.h"
#include "text.h"
#include "Campaign.h"
#include "Items.h"
#include "Text.h"
#include "Soldier Profile.h"
#include "Dialogue Control.h"
#include "SkillCheck.h"
#include "Quests.h"
#include "Physics.h"
#include "Random.h"
#include "physics.h"
#include "random.h"
#include "Vehicles.h"
#include "bullets.h"
#include "morale.h"
#include "Bullets.h"
#include "Morale.h"
#include "SkillCheck.h"
#include "gamesettings.h"
#include "GameSettings.h"
#include "SaveLoadMap.h"
#include "Debug Control.h"
#include "expat.h"
#include "XML.h"
#include "utilities.h"
#include "Utilities.h"
#include "store inventory.h"
// Flugente: in order not to loop over MAXITEMS items if we only have a few thousand, remember the actual number of items in the xml
Utils/XML_Language.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef __XML_LANGUAGE_H
#define __XML_LANGUAGE_H
#include "Types.h"
#include "types.h"
#define MAX_MESSAGE_NAMES_CHARS 400
Utils/XML_SenderNameList.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef _XML_SENDERNAMELIST_H
#define _XML_SENDERNAMELIST_H
#include "Types.h"
#include "types.h"
#define MAX_SENDER_NAMES_CHARS 128
Utils/message.cpp
+5 -5
View File
@@ -1,21 +1,21 @@
#include "sgp.h"
#include "font.h"
#include "Font.h"
#include "types.h"
#include "Font Control.h"
#include "message.h"
#include "memory.h"
#include "mbstring.h"
#include "Timer Control.h"
#include "render dirty.h"
#include "Render Dirty.h"
#include "renderworld.h"
#include "local.h"
#include "interface.h"
#include "Interface.h"
#include "mapscreen.h"
#include "Map Screen Interface Bottom.h"
#include "WordWrap.h"
#include "Sound Control.h"
#include "Soundman.h"
#include "BuildDefines.h"
#include "soundman.h"
#include "builddefines.h"
#include "Dialogue Control.h"
#include <stdio.h>
#include "Game Clock.h"
Utils/message.h
+2 -2
View File
@@ -2,10 +2,10 @@
#define __MESSAGE_H
//#include "sgp.h"
#include "font.h"
#include "Font.h"
#include "Font Control.h"
#include "types.h"
#include "Fileman.h"
#include "FileMan.h"
struct stringstruct{
Utils/popup_class.cpp
+12 -13
View File
@@ -1,14 +1,13 @@
#include "Map Screen Interface.h"
#include "popupbox.h"
#include "interface control.h"
#include "PopUpBox.h"
#include "Interface Control.h"
#include "renderworld.h"
#include "Text.h"
#include "utilities.h"
#include "Utilities.h"
#include "Interface.h"
#include "GameSettings.h"
#include "Input.h"
#include "input.h"
#include "Console.h"
#include "lwstring.h"
#include "message.h"
#include "mousesystem.h"
@@ -21,8 +20,8 @@
// functions and variable declarations for binding the class with C callbacks
//////////////////////////////////////////////////////////////////
vector<PopupIndex> gPopupRegionIndex;
vector<POPUP*> gPopupIndex;
std::vector<PopupIndex> gPopupRegionIndex;
std::vector<POPUP*> gPopupIndex;
UINT32 gPopupRegionIndexCounter = 0;
UINT32 gPopupIndexCounter = 0;
UINT32 POPUP::nextid = 0;
@@ -237,19 +236,19 @@ BOOLEAN POPUP_OPTION::forceRun()
//////////////////////////////////////////////////////////////////
// constructor
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak!
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(void) : POPUP_OPTION(new std::wstring(L"Unnamed subPopup"),NULL) //TODO: possible memmory leak!
{
this->parent = NULL;
this->initSubPopup();
}
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* name) : POPUP_OPTION(name, NULL)
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* name) : POPUP_OPTION(name, NULL)
{
this->parent = NULL;
this->initSubPopup();
}
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL)
POPUP_SUB_POPUP_OPTION::POPUP_SUB_POPUP_OPTION(std::wstring* newName, const POPUP * parent) : POPUP_OPTION(newName, NULL)
{
this->parent = parent;
this->initSubPopup();
@@ -342,7 +341,7 @@ static void unShadeOpenSubPopup( POPUP_SUB_POPUP_OPTION * opt ){
void POPUP_SUB_POPUP_OPTION::initSubPopup()
{
this->subPopup = new POPUP( (CHAR*) wstring(this->name).c_str() );
this->subPopup = new POPUP( (CHAR*) std::wstring(this->name).c_str() );
this->subPopup->setCallback(POPUP_CALLBACK_SHOW,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &shadeOpenSubPopup, this ));
this->subPopup->setCallback(POPUP_CALLBACK_HIDE,new popupCallbackFunction<void,POPUP_SUB_POPUP_OPTION*>( &unShadeOpenSubPopup, this ));
@@ -563,7 +562,7 @@ void POPUP::setInitialValues(void)
// setup functions
POPUP_OPTION * POPUP::addOption(wstring * name, popupCallback* action)
POPUP_OPTION * POPUP::addOption(std::wstring * name, popupCallback* action)
{
if (this->optionCount < POPUP_MAX_OPTIONS)
{
@@ -606,7 +605,7 @@ POPUP_OPTION * POPUP::getOption(UINT16 n)
return NULL;
}
POPUP * POPUP::addSubMenuOption(wstring * name)
POPUP * POPUP::addSubMenuOption(std::wstring * name)
{
if (this->subPopupOptionCount < POPUP_MAX_SUB_POPUPS)
{