hans/CnC_Remastered_Collection
1
0
Fork 0
mirror of https://github.com/jmarshall23/CnC_Remastered_Collection.git synced 2026-08-16 16:20:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

SCENERIO_EDITOR now compiles.

Browse Source
This commit is contained in:
Justin Marshall
2020-06-05 18:49:43 -07:00
parent d223adebd7
commit ca2e5bc7e6
17 changed files with 1614 additions and 1584 deletions
Download Patch File Download Diff File Expand all files Collapse all files
REDALERT/MAPEDDLG.CPP
+3 -3
View File
@@ -2574,7 +2574,7 @@ int MapEditClass::Select_Trigger(void)
*/
ControlClass * commands = NULL; // the button list
TListClass<CCPtr<TriggerTypeClass> > triggerlist(TRIGGER_LIST, D_LIST_X, D_LIST_Y, D_LIST_W, D_LIST_H,
TListClass<const TriggerTypeClass *> triggerlist(TRIGGER_LIST, D_LIST_X, D_LIST_Y, D_LIST_W, D_LIST_H,
TPF_EFNT|TPF_NOSHADOW,
MFCD::Retrieve("EBTN-UP.SHP"),
MFCD::Retrieve("EBTN-DN.SHP"));
@@ -2610,7 +2610,7 @@ int MapEditClass::Select_Trigger(void)
if (TriggerTypes.Count()==0) {
CurTrigger = NULL;
} else {
CurTrigger = triggerlist.Current_Item();
CurTrigger = (TriggerTypeClass *)triggerlist.Current_Item();
// if (!CurTrigger) {
// CurTrigger = &*triggerlist.Current_Item();
// }
@@ -2660,7 +2660,7 @@ int MapEditClass::Select_Trigger(void)
*/
switch (input) {
case (TRIGGER_LIST | KN_BUTTON):
CurTrigger = &*triggerlist.Current_Item();
CurTrigger = (TriggerTypeClass *)&*triggerlist.Current_Item();
// CurTrigger = (TriggerTypeClass *)&*triggerlist.Current_Item();
break;