From 0f3cba6fcea0ffd511dfe3275d57a5b9e69be5be Mon Sep 17 00:00:00 2001 From: Ash Wolf Date: Mon, 10 Jul 2023 02:10:20 +0100 Subject: build a barely-tested Burger plugin --- src/Plugins/Common/StdFoodInfoDialog.cpp | 9 +- src/Plugins/Common/StdFoodInfoDialog.h | 2 +- src/Plugins/Common/StdShopInfoDialog.cpp | 19 +-- src/Plugins/Common/StdShopInfoDialog.h | 2 +- src/Plugins/Common/StdTenantInfoDialog.cpp | 43 +++--- src/Plugins/Common/StdTenantInfoDialog.h | 4 +- src/Plugins/Food/Burger/Burger.clw | 16 +++ src/Plugins/Food/Burger/Burger.cpp | 63 ++++++++- src/Plugins/Food/Burger/Burger.def | 6 + src/Plugins/Food/Burger/Burger.dsp | 201 +++++++++++++++++++++++++++++ src/Plugins/Food/Burger/Burger.h | 45 ++++++- src/Plugins/Food/Burger/Burger.rc | 184 ++++++++++++++++++++++++++ src/Plugins/Food/Burger/StdAfx.cpp | 6 + src/Plugins/Food/Burger/StdAfx.h | 41 ++++++ src/Plugins/Food/Common/FoodDef.cpp | 17 +-- src/Plugins/Food/Common/FoodDef.h | 4 +- src/Plugins/Food/Common/FoodPlugin.cpp | 1 + src/Plugins/Food/Common/FoodPlugin.h | 4 +- src/Plugins/Food/Common/Trash.cpp | 17 +-- src/Plugins/Food/Common/Trash.h | 2 +- src/T2.DSW | 12 ++ src/T2DLL/CResFile.cpp | 13 +- 22 files changed, 639 insertions(+), 72 deletions(-) create mode 100644 src/Plugins/Food/Burger/Burger.clw create mode 100644 src/Plugins/Food/Burger/Burger.def create mode 100644 src/Plugins/Food/Burger/Burger.dsp create mode 100644 src/Plugins/Food/Burger/Burger.rc create mode 100644 src/Plugins/Food/Burger/StdAfx.cpp create mode 100644 src/Plugins/Food/Burger/StdAfx.h (limited to 'src') diff --git a/src/Plugins/Common/StdFoodInfoDialog.cpp b/src/Plugins/Common/StdFoodInfoDialog.cpp index e3002bd..6b40903 100644 --- a/src/Plugins/Common/StdFoodInfoDialog.cpp +++ b/src/Plugins/Common/StdFoodInfoDialog.cpp @@ -1,9 +1,10 @@ +#include "StdAfx.h" #include "../Food/Common/Trash.h" #include "StdFoodInfoDialog.h" -#include "T2EquipPtrList.h" -#include "T2RouteNavigator.h" -#include "T2Tenant.h" -#include "T2TowerDoc.h" +#include "../../T2DLL/T2EquipPtrList.h" +#include "../../T2DLL/T2RouteNavigator.h" +#include "../../T2DLL/T2Tenant.h" +#include "../../T2TowerDoc.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/Plugins/Common/StdFoodInfoDialog.h b/src/Plugins/Common/StdFoodInfoDialog.h index f340a18..380b8be 100644 --- a/src/Plugins/Common/StdFoodInfoDialog.h +++ b/src/Plugins/Common/StdFoodInfoDialog.h @@ -1,5 +1,5 @@ #pragma once -#include "common.h" +#include "../../common.h" #include "StdShopInfoDialog.h" class StdFoodInfoDialog : public StdShopInfoDialog { diff --git a/src/Plugins/Common/StdShopInfoDialog.cpp b/src/Plugins/Common/StdShopInfoDialog.cpp index 43e7283..67aee0b 100644 --- a/src/Plugins/Common/StdShopInfoDialog.cpp +++ b/src/Plugins/Common/StdShopInfoDialog.cpp @@ -1,13 +1,14 @@ +#include "StdAfx.h" #include "StdShopInfoDialog.h" -#include "T2DateTime.h" -#include "T2DlgItemArrows.h" -#include "T2DlgItemEdit.h" -#include "T2DlgItemMerchandiseField.h" -#include "T2Tenant.h" -#include "T2TenantMemberDef.h" -#include "T2TenantMemberTableDef.h" -#include "T2TowerDoc.h" -#include "T2WorldDef.h" +#include "../../T2DLL/T2DateTime.h" +#include "../../T2DLL/T2DlgItemArrows.h" +#include "../../T2DLL/T2DlgItemEdit.h" +#include "../../T2DLL/T2DlgItemMerchandiseField.h" +#include "../../T2DLL/T2Tenant.h" +#include "../../T2DLL/T2TenantMemberDef.h" +#include "../../T2DLL/T2TenantMemberTableDef.h" +#include "../../T2TowerDoc.h" +#include "../../T2DLL/T2WorldDef.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/Plugins/Common/StdShopInfoDialog.h b/src/Plugins/Common/StdShopInfoDialog.h index 280b2cc..2028828 100644 --- a/src/Plugins/Common/StdShopInfoDialog.h +++ b/src/Plugins/Common/StdShopInfoDialog.h @@ -1,5 +1,5 @@ #pragma once -#include "common.h" +#include "../../common.h" #include "StdTenantInfoDialog.h" class StdShopInfoDialog : public StdTenantInfoDialog { diff --git a/src/Plugins/Common/StdTenantInfoDialog.cpp b/src/Plugins/Common/StdTenantInfoDialog.cpp index 3bad68c..3327674 100644 --- a/src/Plugins/Common/StdTenantInfoDialog.cpp +++ b/src/Plugins/Common/StdTenantInfoDialog.cpp @@ -1,24 +1,25 @@ +#include "StdAfx.h" #include "StdTenantInfoDialog.h" -#include "T2DlgItemCustomerGage.h" -#include "T2DlgItemPeopleView.h" -#include "T2DlgItemProfitsGage.h" -#include "T2DlgItemText.h" -#include "T2FloorInfo.h" -#include "T2Maru_Reggae.h" -#include "T2Mover.h" -#include "T2Name.h" -#include "T2NameList.h" -#include "T2People.h" -#include "T2PeopleLinkIterator.h" -#include "T2PeoplePtrList.h" -#include "T2RouteCEArray.h" -#include "T2RouteNavigator.h" -#include "T2Tenant.h" -#include "T2TenantDef.h" -#include "T2TowerDoc.h" -#include "T2WorldDef.h" -#include "UT2Coordinate.h" -#include "UT2Utils.h" +#include "../../T2DLL/T2DlgItemCustomerGage.h" +#include "../../T2DLL/T2DlgItemPeopleView.h" +#include "../../T2DLL/T2DlgItemProfitsGage.h" +#include "../../T2DLL/T2DlgItemText.h" +#include "../../T2DLL/T2FloorInfo.h" +#include "../../T2DLL/T2Maru_Reggae.h" +#include "../../T2DLL/T2Mover.h" +#include "../../T2DLL/T2Name.h" +#include "../../T2DLL/T2NameList.h" +#include "../../T2DLL/T2People.h" +#include "../../T2DLL/T2PeopleLinkIterator.h" +#include "../../T2DLL/T2PeoplePtrList.h" +#include "../../T2DLL/T2RouteCEArray.h" +#include "../../T2DLL/T2RouteNavigator.h" +#include "../../T2DLL/T2Tenant.h" +#include "../../T2DLL/T2TenantDef.h" +#include "../../T2TowerDoc.h" +#include "../../T2DLL/T2WorldDef.h" +#include "../../T2DLL/UT2Coordinate.h" +#include "../../T2DLL/UT2Utils.h" StdTenantInfoDialog::StdTenantInfoDialog(T2Tenant *inTenant) : T2TenantInfoDialog(inTenant) @@ -45,6 +46,8 @@ StdTenantInfoDialog::StdTenantInfoDialog(T2Tenant *inTenant) if (name == "") nameField->SetDescriptor(mTenantName); } + + return false; } /*virtual*/ void StdTenantInfoDialog::OnT2Create() { diff --git a/src/Plugins/Common/StdTenantInfoDialog.h b/src/Plugins/Common/StdTenantInfoDialog.h index 6220261..553a9ba 100644 --- a/src/Plugins/Common/StdTenantInfoDialog.h +++ b/src/Plugins/Common/StdTenantInfoDialog.h @@ -1,6 +1,6 @@ #pragma once -#include "common.h" -#include "T2TenantInfoDialog.h" +#include "../../common.h" +#include "../../T2DLL/T2TenantInfoDialog.h" class StdTenantInfoDialog : public T2TenantInfoDialog { public: diff --git a/src/Plugins/Food/Burger/Burger.clw b/src/Plugins/Food/Burger/Burger.clw new file mode 100644 index 0000000..1d454bc --- /dev/null +++ b/src/Plugins/Food/Burger/Burger.clw @@ -0,0 +1,16 @@ +; CLW file contains information for the MFC ClassWizard + +[General Info] +Version=1 +ClassCount=1 +Class1=CBurgerApp +LastClass=CBurgerApp +NewFileInclude2=#include "Burger.h" +ResourceCount=0 +NewFileInclude1=#include "stdafx.h" + +[CLS:CBurgerApp] +Type=0 +HeaderFile=Burger.h +ImplementationFile=Burger.cpp +Filter=N diff --git a/src/Plugins/Food/Burger/Burger.cpp b/src/Plugins/Food/Burger/Burger.cpp index e18f508..2e9f301 100644 --- a/src/Plugins/Food/Burger/Burger.cpp +++ b/src/Plugins/Food/Burger/Burger.cpp @@ -1,5 +1,9 @@ +// Burger.cpp : Defines the initialization routines for the DLL. +// + +#include "stdafx.h" #include "Burger.h" -#include "T2PluginSpecifier.h" +#include "../../../T2DLL/T2PluginSpecifier.h" #include "../Common/FoodDef.h" #include "../Common/FoodPlugin.h" @@ -9,27 +13,70 @@ static char THIS_FILE[] = __FILE__; #endif +// +// Note! +// +// If this DLL is dynamically linked against the MFC +// DLLs, any functions exported from this DLL which +// call into MFC must have the AFX_MANAGE_STATE macro +// added at the very beginning of the function. +// +// For example: +// +// extern "C" BOOL PASCAL EXPORT ExportedFunction() +// { +// AFX_MANAGE_STATE(AfxGetStaticModuleState()); +// // normal function body here +// } +// +// It is very important that this macro appear in each +// function, prior to any calls into MFC. This means that +// it must appear as the first statement within the +// function, even before any object variable declarations +// as their constructors may generate calls into the MFC +// DLL. +// +// Please see MFC Technical Notes 33 and 58 for additional +// details. +// + +///////////////////////////////////////////////////////////////////////////// +// CBurgerApp + BEGIN_MESSAGE_MAP(CBurgerApp, CWinApp) + //{{AFX_MSG_MAP(CBurgerApp) + // NOTE - the ClassWizard will add and remove mapping macros here. + // DO NOT EDIT what you see in these blocks of generated code! + //}}AFX_MSG_MAP END_MESSAGE_MAP() -CBurgerApp::CBurgerApp() { +///////////////////////////////////////////////////////////////////////////// +// CBurgerApp construction + +CBurgerApp::CBurgerApp() +{ } +///////////////////////////////////////////////////////////////////////////// +// The one and only CBurgerApp object + CBurgerApp theApp; FoodPlugin *sFoodPlugin; FoodDef *sFoodDef; -extern "C" void *AFX_EXT_API CALLBACK ConstructProgramPlugin(T2PluginSpecifier *inSpecifier) { +#pragma comment(linker, "/export:ConstructProgramPlugin=_ConstructProgramPlugin@4") +extern "C" void *CALLBACK ConstructProgramPlugin(T2PluginSpecifier *inSpecifier) { if (!sFoodPlugin) { #line 88 - sFoodPlugin = new FoodPlugin('TnPl', inSpecifier); + sFoodPlugin = new FoodPlugin('TnPl', *inSpecifier); } return sFoodPlugin; } -extern "C" void *AFX_EXT_API CALLBACK ConstructTemplatePlugin(T2PluginSpecifier *inSpecifier, CResFile *inResFile, T2WorldDef *inWorldDef, T2TenantPlugin *inPlugin) { +#pragma comment(linker, "/export:ConstructTemplatePlugin=_ConstructTemplatePlugin@16") +extern "C" void *CALLBACK ConstructTemplatePlugin(T2PluginSpecifier *inSpecifier, CResFile *inResFile, T2WorldDef *inWorldDef, T2TenantPlugin *inPlugin) { if (!sFoodDef) { #line 101 sFoodDef = new FoodDef('TnDf', *inSpecifier, inResFile, inWorldDef, inPlugin); @@ -38,7 +85,8 @@ extern "C" void *AFX_EXT_API CALLBACK ConstructTemplatePlugin(T2PluginSpecifier return sFoodDef; } -extern "C" void *AFX_EXT_API CALLBACK DestructProgramPlugin() { +#pragma comment(linker, "/export:DestructProgramPlugin=_DestructProgramPlugin@0") +extern "C" void *CALLBACK DestructProgramPlugin() { delete sFoodPlugin; sFoodPlugin = NULL; @@ -48,7 +96,8 @@ extern "C" void *AFX_EXT_API CALLBACK DestructProgramPlugin() { return NULL; } -extern "C" T2PluginSpecifier *AFX_EXT_API CALLBACK GetAttr(T2PluginSpecifier *inSpecifier, CResFile *inResFile, T2WorldDef *inWorldDef, T2TenantPlugin *inPlugin) { +#pragma comment(linker, "/export:GetAttr=_GetAttr@16") +extern "C" T2PluginSpecifier *CALLBACK GetAttr(T2PluginSpecifier *inSpecifier, CResFile *inResFile, T2WorldDef *inWorldDef, T2TenantPlugin *inPlugin) { #line 120 T2PluginSpecifier *specifier = new T2PluginSpecifier; specifier->mPluginName = "Burgar"; diff --git a/src/Plugins/Food/Burger/Burger.def b/src/Plugins/Food/Burger/Burger.def new file mode 100644 index 0000000..c6ca96c --- /dev/null +++ b/src/Plugins/Food/Burger/Burger.def @@ -0,0 +1,6 @@ +; Burger.def : Declares the module parameters for the DLL. + +LIBRARY "Burger" +DESCRIPTION 'Burger Windows Dynamic Link Library' + +EXPORTS diff --git a/src/Plugins/Food/Burger/Burger.dsp b/src/Plugins/Food/Burger/Burger.dsp new file mode 100644 index 0000000..4743baa --- /dev/null +++ b/src/Plugins/Food/Burger/Burger.dsp @@ -0,0 +1,201 @@ +# Microsoft Developer Studio Project File - Name="Burger" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 5.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=Burger - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "Burger.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "Burger.mak" CFG="Burger - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "Burger - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "Burger - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "Burger - Win32 Release" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "NDEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /dll /machine:I386 +# ADD LINK32 /nologo /subsystem:windows /dll /machine:I386 + +!ELSEIF "$(CFG)" == "Burger - Win32 Debug" + +# PROP BASE Use_MFC 6 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 6 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# ADD BASE CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /Yu"stdafx.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "Z:\Users\ash\src\t2-res\dx5\cdrom\sdk\inc" /I "Z:\Users\ash\src\t2-res\dxmedia51\DX51\dxmdev\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_WINDLL" /D "_AFXDLL" /D "_USRDLL" /Yu"stdafx.h" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o NUL /win32 +# ADD BASE RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +# ADD RSC /l 0x809 /d "_DEBUG" /d "_AFXDLL" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 ../../../T2DLL/Debug/T2DLL.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\Burger.t2p" /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "Burger - Win32 Release" +# Name "Burger - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" +# Begin Source File + +SOURCE=.\Burger.cpp +# End Source File +# Begin Source File + +SOURCE=.\Burger.def +# End Source File +# Begin Source File + +SOURCE=.\Burger.rc + +!IF "$(CFG)" == "Burger - Win32 Release" + +!ELSEIF "$(CFG)" == "Burger - Win32 Debug" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=..\Common\FoodDef.cpp +# End Source File +# Begin Source File + +SOURCE=..\Common\FoodPlugin.cpp +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.cpp +# ADD CPP /Yc"stdafx.h" +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdFoodInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdShopInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdTenantInfoDialog.cpp +# End Source File +# Begin Source File + +SOURCE=..\Common\Trash.cpp +# End Source File +# End Group +# Begin Group "Header Files" + +# PROP Default_Filter "h;hpp;hxx;hm;inl" +# Begin Source File + +SOURCE=.\Burger.h +# End Source File +# Begin Source File + +SOURCE=..\Common\FoodDef.h +# End Source File +# Begin Source File + +SOURCE=..\Common\FoodPlugin.h +# End Source File +# Begin Source File + +SOURCE=.\Resource.h +# End Source File +# Begin Source File + +SOURCE=.\StdAfx.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdFoodInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdShopInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=..\..\Common\StdTenantInfoDialog.h +# End Source File +# Begin Source File + +SOURCE=..\Common\Trash.h +# End Source File +# End Group +# Begin Group "Resource Files" + +# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" +# Begin Source File + +SOURCE=.\res\ATTR128_1.bin +# End Source File +# Begin Source File + +SOURCE=.\res\Burger.rc2 +# End Source File +# Begin Source File + +SOURCE=.\res\SLDF1_1.bin +# End Source File +# End Group +# Begin Source File + +SOURCE=.\res\OBJMAP100_1.txt +# End Source File +# End Target +# End Project diff --git a/src/Plugins/Food/Burger/Burger.h b/src/Plugins/Food/Burger/Burger.h index 37b2774..eb21d60 100644 --- a/src/Plugins/Food/Burger/Burger.h +++ b/src/Plugins/Food/Burger/Burger.h @@ -1,9 +1,46 @@ +// Burger.h : main header file for the BURGER DLL +// + +#if !defined(AFX_BURGER_H__81154B54_BBFC_4E61_A2BC_BB53B98894B3__INCLUDED_) +#define AFX_BURGER_H__81154B54_BBFC_4E61_A2BC_BB53B98894B3__INCLUDED_ + +#if _MSC_VER >= 1000 #pragma once -#include "common.h" +#endif // _MSC_VER >= 1000 + +#ifndef __AFXWIN_H__ + #error include 'stdafx.h' before including this file for PCH +#endif + +#include "../../../common.h" +#include "resource.h" // main symbols + +///////////////////////////////////////////////////////////////////////////// +// CBurgerApp +// See Burger.cpp for the implementation of this class +// -class CBurgerApp : public CWinApp { +class CBurgerApp : public CWinApp +{ public: - CBurgerApp(); + CBurgerApp(); - DECLARE_MESSAGE_MAP() +// Overrides + // ClassWizard generated virtual function overrides + //{{AFX_VIRTUAL(CBurgerApp) + //}}AFX_VIRTUAL + + //{{AFX_MSG(CBurgerApp) + // NOTE - the ClassWizard will add and remove member functions here. + // DO NOT EDIT what you see in these blocks of generated code ! + //}}AFX_MSG + DECLARE_MESSAGE_MAP() }; + + +///////////////////////////////////////////////////////////////////////////// + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_BURGER2_H__81154B54_BBFC_4E61_A2BC_BB53B98894B3__INCLUDED_) diff --git a/src/Plugins/Food/Burger/Burger.rc b/src/Plugins/Food/Burger/Burger.rc new file mode 100644 index 0000000..058618a --- /dev/null +++ b/src/Plugins/Food/Burger/Burger.rc @@ -0,0 +1,184 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +128 ATTR "res\\ATTR128_1.bin" + +128 DESC "res\\DESC128_1.txt" + +128 DPDF "res\\DPDF128_1.bin" + +100 OBJMAP "res\\OBJMAP100_1.txt" + +1000 OBJMAP "res\\OBJMAP1000_1.txt" + +1001 OBJMAP "res\\OBJMAP1001_1.txt" + +1002 OBJMAP "res\\OBJMAP1002_1.txt" + +1003 OBJMAP "res\\OBJMAP1003_1.txt" + +1100 OBJMAP "res\\OBJMAP1100_1.txt" + +1 PADF "res\\PADF1_1.bin" + +128 PLDF "res\\PLDF128_1.bin" + +1 SLDF "res\\SLDF1_1.bin" + +1000 T2DLG "res\\T2DLG1000_1.txt" + +1 TMDF "res\\TMDF1_1.bin" + +2 TMDF "res\\TMDF2_1.bin" + +1 TNDF "res\\TNDF1_1.bin" + +165 WAVE "res\\WAVE165_1.wav" + +1 WODF "res\\WODF1_1.bin" + +100 BITMAP "res\\BITMAP100_1.bmp" + +300 BITMAP "res\\BITMAP300_1.bmp" + +301 BITMAP "res\\BITMAP301_1.bmp" + +302 BITMAP "res\\BITMAP302_1.bmp" + +303 BITMAP "res\\BITMAP303_1.bmp" + +310 BITMAP "res\\BITMAP310_1.bmp" + +311 BITMAP "res\\BITMAP311_1.bmp" + +1000 BITMAP "res\\BITMAP1000_1.bmp" + +1001 BITMAP "res\\BITMAP1001_1.bmp" + +1002 BITMAP "res\\BITMAP1002_1.bmp" + +1003 BITMAP "res\\BITMAP1003_1.bmp" + +1100 BITMAP "res\\BITMAP1100_1.bmp" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "#define _AFX_NO_SPLITTER_RESOURCES\r\n" + "#define _AFX_NO_OLE_RESOURCES\r\n" + "#define _AFX_NO_TRACKER_RESOURCES\r\n" + "#define _AFX_NO_PROPERTY_RESOURCES\r\n" + "\r\n" + "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" + "#ifdef _WIN32\r\n" + "LANGUAGE 9, 1\r\n" + "#pragma code_page(1252)\r\n" + "#endif\r\n" + "#include ""res\\Burger.rc2"" // non-Microsoft Visual C++ edited resources\r\n" + "#include ""afxres.rc"" // Standard components\r\n" + "#endif" + "\0" +END + +///////////////////////////////////////////////////////////////////////////// +#endif // APSTUDIO_INVOKED + + + + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION 1,0,0,1 + PRODUCTVERSION 1,0,0,1 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x4L + FILETYPE 0x2L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904B0" + BEGIN + VALUE "CompanyName", "\0" + VALUE "FileDescription", "Burger DLL\0" + VALUE "FileVersion", "1, 0, 0, 1\0" + VALUE "InternalName", "Burger\0" + VALUE "LegalCopyright", "Copyright (C) 1923\0" + VALUE "LegalTrademarks", "\0" + VALUE "OriginalFilename","Burger.DLL\0" + VALUE "ProductName", "Burger Dynamic Link Library\0" + VALUE "ProductVersion", "1, 0, 0, 1\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// +#define _AFX_NO_SPLITTER_RESOURCES +#define _AFX_NO_OLE_RESOURCES +#define _AFX_NO_TRACKER_RESOURCES +#define _AFX_NO_PROPERTY_RESOURCES + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE 9, 1 +#pragma code_page(1252) +#endif +#include "res\\Burger.rc2" // non-Microsoft Visual C++ edited resources +#include "afxres.rc" // Standard components +#endif + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/src/Plugins/Food/Burger/StdAfx.cpp b/src/Plugins/Food/Burger/StdAfx.cpp new file mode 100644 index 0000000..a773193 --- /dev/null +++ b/src/Plugins/Food/Burger/StdAfx.cpp @@ -0,0 +1,6 @@ +// stdafx.cpp : source file that includes just the standard includes +// Burger.pch will be the pre-compiled header +// stdafx.obj will contain the pre-compiled type information + +#include "stdafx.h" + diff --git a/src/Plugins/Food/Burger/StdAfx.h b/src/Plugins/Food/Burger/StdAfx.h new file mode 100644 index 0000000..9fc556e --- /dev/null +++ b/src/Plugins/Food/Burger/StdAfx.h @@ -0,0 +1,41 @@ +// stdafx.h : include file for standard system include files, +// or project specific include files that are used frequently, but +// are changed infrequently +// + +#if !defined(AFX_STDAFX_H__AF935A55_9E17_4611_818A_EF6A4343861E__INCLUDED_) +#define AFX_STDAFX_H__AF935A55_9E17_4611_818A_EF6A4343861E__INCLUDED_ + +#if _MSC_VER >= 1000 +#pragma once +#endif // _MSC_VER >= 1000 + +#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers + +#include // MFC core and standard components +#include // MFC extensions + +#ifndef _AFX_NO_OLE_SUPPORT +#include // MFC OLE classes +#include // MFC OLE dialog classes +#include // MFC OLE automation classes +#endif // _AFX_NO_OLE_SUPPORT + + +#ifndef _AFX_NO_DB_SUPPORT +#include // MFC ODBC database classes +#endif // _AFX_NO_DB_SUPPORT + +#ifndef _AFX_NO_DAO_SUPPORT +#include // MFC DAO database classes +#endif // _AFX_NO_DAO_SUPPORT + +#ifndef _AFX_NO_AFXCMN_SUPPORT +#include // MFC support for Windows Common Controls +#endif // _AFX_NO_AFXCMN_SUPPORT + + +//{{AFX_INSERT_LOCATION}} +// Microsoft Developer Studio will insert additional declarations immediately before the previous line. + +#endif // !defined(AFX_STDAFX_H__AF935A55_9E17_4611_818A_EF6A4343861E__INCLUDED_) diff --git a/src/Plugins/Food/Common/FoodDef.cpp b/src/Plugins/Food/Common/FoodDef.cpp index dfc84ad..994fe5a 100644 --- a/src/Plugins/Food/Common/FoodDef.cpp +++ b/src/Plugins/Food/Common/FoodDef.cpp @@ -1,14 +1,15 @@ +#include "StdAfx.h" #include "FoodDef.h" #include "../../Common/StdFoodInfoDialog.h" #include "Trash.h" -#include "T2DateTime.h" -#include "T2People.h" -#include "T2SoundPlayer.h" -#include "T2TemplatePluginList.h" -#include "T2Tenant.h" -#include "T2TowerDoc.h" -#include "T2TowerMainView.h" -#include "UT2Utils.h" +#include "../../../T2DLL/T2DateTime.h" +#include "../../../T2DLL/T2People.h" +#include "../../../T2DLL/T2SoundPlayer.h" +#include "../../../T2DLL/T2TemplatePluginList.h" +#include "../../../T2DLL/T2Tenant.h" +#include "../../../T2TowerDoc.h" +#include "../../../T2TowerMainView.h" +#include "../../../T2DLL/UT2Utils.h" #ifdef _DEBUG #define new DEBUG_NEW diff --git a/src/Plugins/Food/Common/FoodDef.h b/src/Plugins/Food/Common/FoodDef.h index f425270..67b86bf 100644 --- a/src/Plugins/Food/Common/FoodDef.h +++ b/src/Plugins/Food/Common/FoodDef.h @@ -1,6 +1,6 @@ #pragma once -#include "common.h" -#include "T2TenantDef.h" +#include "../../../common.h" +#include "../../../T2DLL/T2TenantDef.h" class FoodDef : public T2TenantDef { public: diff --git a/src/Plugins/Food/Common/FoodPlugin.cpp b/src/Plugins/Food/Common/FoodPlugin.cpp index 22e72fe..e0390fd 100644 --- a/src/Plugins/Food/Common/FoodPlugin.cpp +++ b/src/Plugins/Food/Common/FoodPlugin.cpp @@ -1,3 +1,4 @@ +#include "StdAfx.h" #include "FoodPlugin.h" #ifdef _DEBUG diff --git a/src/Plugins/Food/Common/FoodPlugin.h b/src/Plugins/Food/Common/FoodPlugin.h index 5cd0a5a..78e1e6b 100644 --- a/src/Plugins/Food/Common/FoodPlugin.h +++ b/src/Plugins/Food/Common/FoodPlugin.h @@ -1,6 +1,6 @@ #pragma once -#include "common.h" -#include "T2TenantPlugin.h" +#include "../../../common.h" +#include "../../../T2DLL/T2TenantPlugin.h" class FoodPlugin : public T2TenantPlugin { public: diff --git a/src/Plugins/Food/Common/Trash.cpp b/src/Plugins/Food/Common/Trash.cpp index 15e7c6c..b6f2230 100644 --- a/src/Plugins/Food/Common/Trash.cpp +++ b/src/Plugins/Food/Common/Trash.cpp @@ -1,11 +1,12 @@ // actual name unknown -#include "T2EquipPtrList.h" -#include "T2People.h" -#include "T2RegistedTenantDB.h" -#include "T2RouteNavigator.h" -#include "T2Tenant.h" -#include "T2TowerDoc.h" -#include "T2TowerMessage.h" +#include "StdAfx.h" +#include "../../../T2DLL/T2EquipPtrList.h" +#include "../../../T2DLL/T2People.h" +#include "../../../T2DLL/T2RegistedTenantDB.h" +#include "../../../T2DLL/T2RouteNavigator.h" +#include "../../../T2DLL/T2Tenant.h" +#include "../../../T2TowerDoc.h" +#include "../../../T2DLL/T2TowerMessage.h" #include "Trash.h" void TakeOutTrash(T2TowerDoc *inDoc, T2Tenant *inTenant, unsigned int inTime) { @@ -95,7 +96,7 @@ T2EquipPtrList *GetTrashFacilities(T2TowerDoc *inDoc, T2Tenant *inTenant) { T2RegistedTenantDB *theDB = inDoc->GetRegistedTenantDB(); if (theDB) { theList = theDB->GetList(kTenantRegistID2); - inTenant->SetRelatedTenant(theList); + inTenant->SetRelatedTenantList(theList); } } diff --git a/src/Plugins/Food/Common/Trash.h b/src/Plugins/Food/Common/Trash.h index 59b7fdd..e2bcfcd 100644 --- a/src/Plugins/Food/Common/Trash.h +++ b/src/Plugins/Food/Common/Trash.h @@ -1,5 +1,5 @@ #pragma once -#include "common.h" +#include "../../../common.h" void TakeOutTrash(T2TowerDoc *inDoc, T2Tenant *inTenant, unsigned int inTime); T2Tenant *SelectTrashFacility(T2TowerDoc *inDoc, T2Tenant *inTenant, T2People *inPeople); diff --git a/src/T2.DSW b/src/T2.DSW index 9988a20..83dcd2c 100644 --- a/src/T2.DSW +++ b/src/T2.DSW @@ -3,6 +3,18 @@ Microsoft Developer Studio Workspace File, Format Version 5.00 ############################################################################### +Project: "Burger"=.\Plugins\Food\Burger\Burger.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "T2"=.\T2.DSP - Package Owner=<4> Package=<5> diff --git a/src/T2DLL/CResFile.cpp b/src/T2DLL/CResFile.cpp index f481729..29b461b 100644 --- a/src/T2DLL/CResFile.cpp +++ b/src/T2DLL/CResFile.cpp @@ -127,12 +127,19 @@ BOOL CResFile::OpenResource(const char* path, int name, int type) { CString path; #ifdef HACKS unsigned short langID = 1041; + path.Format("\\.rsrc\\%s\\#%d\\#%d", buf, name, langID); + if (!pe.Seek(path)) { + langID = 2057; + path.Format("\\.rsrc\\%s\\#%d\\#%d", buf, name, langID); + if (!pe.Seek(path)) + return false; + } #else unsigned short langID = GetUserDefaultLangID(); + path.Format("\\.rsrc\\%s\\#%d\\#%d", buf, name, langID); + if (!pe.Seek(path)) + return false; #endif - path.Format("\\.rsrc\\%s\\#%d\\#%d", buf, name, langID); - if (!pe.Seek(path)) - return false; mRemaining = pe.GetLength(); mBuffer = (char *) malloc(mRemaining + 1); -- cgit v1.2.3