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

Revert "Merge branch 'Isometric-Dev' into master"

Browse Source 
This reverts commit ae0648fccc, reversing
changes made to d7243e8265.
This commit is contained in:
Justin Marshall
2020-08-06 15:50:30 -07:00
parent ae0648fccc
commit 6685b5d51a
433 changed files with 8487 additions and 172344 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/redalert/template.cpp
+8 -9
View File
@@ -41,7 +41,7 @@
#include "function.h"
#include "template.h"
#include "image.h"
/***********************************************************************************************
* TemplateClass::Init -- Resets the template object system. *
@@ -87,11 +87,10 @@ bool TemplateClass::Mark(MarkType mark)
assert(IsActive);
static bool noup = false;
IsoTile* isoTile = (IsoTile *)Get_Image_Data();
if (isoTile && ObjectClass::Mark(mark)) {
void const * iset = Get_Image_Data();
if (iset && ObjectClass::Mark(mark)) {
//void * map = Get_Icon_Set_Map(iset);
void * map = Get_Icon_Set_Map(iset);
for (int y = 0; y < Class->Height; y++) {
for (int x = 0; x < Class->Width; x++) {
@@ -105,10 +104,10 @@ bool TemplateClass::Mark(MarkType mark)
** icon is associated with this logical position, then don't do any action
** since none is required.
*/
//char * mapptr = (char*)map;
//bool real = (mapptr[number] != -1);
if(isoTile->GetTileInfo(number) != NULL)
{
char * mapptr = (char*)map;
bool real = (mapptr[number] != -1);
if (real) {
/*
** Lift the terrain object from the map.
*/