Tiles are now drawn with border correction.
This commit is contained in:
johns
parent
c6bcd72799
commit
7a0dbfb8f7
3 changed files with 514 additions and 33 deletions
src
|
|
@ -211,6 +211,9 @@ local void EditTile(int x, int y, int tile)
|
|||
UpdateMinimapSeenXY(x, y);
|
||||
UpdateMinimapXY(x, y);
|
||||
|
||||
EditorTileChanged(x, y);
|
||||
|
||||
#if 0
|
||||
//
|
||||
// Fix the wood tiles.
|
||||
//
|
||||
|
|
@ -260,6 +263,7 @@ local void EditTile(int x, int y, int tile)
|
|||
MapFixWallTile(x - 1, y + 0);
|
||||
MapFixWallTile(x + 0, y - 1);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -450,9 +454,31 @@ local void DrawUnitIcons(void)
|
|||
VideoDrawText(x, y, GameFont, buf);
|
||||
}
|
||||
|
||||
x = TheUI.InfoPanelX + 4;
|
||||
y += 18;
|
||||
//
|
||||
// Draw the unit selection buttons.
|
||||
//
|
||||
x = TheUI.InfoPanelX + 10;
|
||||
y = TheUI.InfoPanelY + 140;
|
||||
|
||||
VideoDrawText(x + 28 * 0, y, GameFont, "Un");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 0, y + 16);
|
||||
VideoDrawText(x + 28 * 1, y, GameFont, "Bu");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 1, y + 16);
|
||||
VideoDrawText(x + 28 * 2, y, GameFont, "He");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 2, y + 16);
|
||||
VideoDrawText(x + 28 * 3, y, GameFont, "La");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 3, y + 16);
|
||||
VideoDrawText(x + 28 * 4, y, GameFont, "Wa");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 4, y + 16);
|
||||
VideoDrawText(x + 28 * 5, y, GameFont, "Ai");
|
||||
VideoDraw(MenuButtonGfx.Sprite,
|
||||
MBUTTON_GEM_SQUARE + (1 ? 2 : 0), x + 28 * 5, y + 16);
|
||||
#if 0
|
||||
j = 0;
|
||||
for (i = 0; EditorUnitTypes[i]; ++i) {
|
||||
const UnitType *type;
|
||||
|
|
@ -508,6 +534,35 @@ local void DrawUnitIcons(void)
|
|||
sprintf(buf, "Air units %d\n", j);
|
||||
VideoDrawText(x, y, GameFont, buf);
|
||||
|
||||
#endif
|
||||
|
||||
//
|
||||
// Scroll bar for units. FIXME: drag not supported.
|
||||
//
|
||||
x = TheUI.ButtonPanelX + 4;
|
||||
y = TheUI.ButtonPanelY + 4;
|
||||
j = 176-8;
|
||||
|
||||
PushClipping();
|
||||
SetClipping(0,0,x + j - 20,VideoHeight-1);
|
||||
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x - 2, y);
|
||||
PopClipping();
|
||||
if (0) {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW + 1, x - 2, y);
|
||||
} else {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW, x - 2, y);
|
||||
}
|
||||
if (1) {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW + 1, x + j - 20, y);
|
||||
} else {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW, x + j - 20, y);
|
||||
}
|
||||
i = (50 * (j - 54)) / 100;
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_S_KNOB, x + 18 + i, y + 1);
|
||||
|
||||
//
|
||||
// Draw the unit icons.
|
||||
//
|
||||
y = TheUI.ButtonPanelY + 24;
|
||||
|
||||
i = UnitIndex;
|
||||
|
|
@ -540,27 +595,6 @@ local void DrawUnitIcons(void)
|
|||
}
|
||||
y += ICON_HEIGHT + 2;
|
||||
}
|
||||
|
||||
x = TheUI.ButtonPanelX + 4;
|
||||
y = TheUI.ButtonPanelY + 4;
|
||||
j = 176-8;
|
||||
|
||||
PushClipping();
|
||||
SetClipping(0,0,x + j - 20,VideoHeight-1);
|
||||
VideoDrawClip(MenuButtonGfx.Sprite, MBUTTON_S_HCONT, x - 2, y);
|
||||
PopClipping();
|
||||
if (0) {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW + 1, x - 2, y);
|
||||
} else {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_LEFT_ARROW, x - 2, y);
|
||||
}
|
||||
if (1) {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW + 1, x + j - 20, y);
|
||||
} else {
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_RIGHT_ARROW, x + j - 20, y);
|
||||
}
|
||||
i = (50 * (j - 54)) / 100;
|
||||
VideoDraw(MenuButtonGfx.Sprite, MBUTTON_S_KNOB, x + 18 + i, y + 1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -720,13 +754,9 @@ local void DrawEditorInfo(void)
|
|||
}
|
||||
|
||||
sprintf(buf, "Editor: (%d %d)", x, y);
|
||||
VideoDrawText(TheUI.ResourceX + 2, TheUI.ResourceY + 2, GameFont, buf);
|
||||
|
||||
flags = TheMap.Fields[x + y * TheMap.Width].Flags;
|
||||
|
||||
x = TheUI.ResourceX + 2;
|
||||
y = TheUI.ResourceY + 2;
|
||||
|
||||
VideoDrawText(x, y, GameFont, buf);
|
||||
|
||||
sprintf(buf, "%02X|%04X|%c%c%c%c%c%c%c%c%c%c%c%c%c",
|
||||
TheMap.Fields[x + y * TheMap.Width].Value, flags,
|
||||
flags & MapFieldUnpassable ? 'u' : '-',
|
||||
|
|
@ -742,7 +772,9 @@ local void DrawEditorInfo(void)
|
|||
flags & MapFieldAirUnit ? 'a' : '-',
|
||||
flags & MapFieldSeaUnit ? 's' : '-',
|
||||
flags & MapFieldBuilding ? 'b' : '-');
|
||||
VideoDrawText(x + 150, y, GameFont, buf);
|
||||
VideoDrawText(TheUI.ResourceX + 152, TheUI.ResourceY + 2, GameFont, buf);
|
||||
sprintf(buf, "Tile: %d", TheMap.Fields[x + y * TheMap.Width].Tile);
|
||||
VideoDrawText(TheUI.ResourceX + 302, TheUI.ResourceY + 2, GameFont, buf);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1383,8 +1415,11 @@ local void EditorCallbackMouse(int x, int y)
|
|||
bx = TheUI.ButtonPanelX + 4;
|
||||
while (bx < TheUI.ButtonPanelX + 144) {
|
||||
if (bx < x && x < bx + 32 && by < y && y < by + 32) {
|
||||
SetStatusLine(TheMap.Tileset->TileNames[
|
||||
TheMap.Tileset->BasicNameTable[i * 16 + 16]]);
|
||||
int j;
|
||||
|
||||
// FIXME: i is wrong, must find the solid type
|
||||
j = TheMap.Tileset->BasicNameTable[i * 16 + 16];
|
||||
SetStatusLine(TheMap.Tileset->TileNames[j]);
|
||||
ButtonUnderCursor = i + 100;
|
||||
CursorOn = CursorOnButton;
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -30,13 +30,26 @@
|
|||
----------------------------------------------------------------------------*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
||||
#include "freecraft.h"
|
||||
#include "map.h"
|
||||
#include "minimap.h"
|
||||
|
||||
extern void ChangeTile(int x, int y, int tile);
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
-- Defines
|
||||
----------------------------------------------------------------------------*/
|
||||
|
||||
#define TH_QUAD_M 0xFFFF0000 /// Top half quad mask
|
||||
#define BH_QUAD_M 0x0000FFFF /// Bottom half quad mask
|
||||
#define LH_QUAD_M 0xFF00FF00 /// Left half quad mask
|
||||
#define RH_QUAD_M 0x00FF00FF /// Right half quad mask
|
||||
|
||||
/// Callback for changed tile (with direction mask)
|
||||
local void EditorTileChanged2(int x, int y, int d);
|
||||
|
||||
/*----------------------------------------------------------------------------
|
||||
-- Variables
|
||||
----------------------------------------------------------------------------*/
|
||||
|
|
@ -45,4 +58,434 @@
|
|||
-- Functions
|
||||
----------------------------------------------------------------------------*/
|
||||
|
||||
/**
|
||||
** Get quad from tile.
|
||||
**
|
||||
** A quad is a 32 bit value defining the content of the tile.
|
||||
**
|
||||
** A tile is split into 4 parts, the basic tile type of this part
|
||||
** is stored as 8bit value in the quad.
|
||||
**
|
||||
** ab
|
||||
** cd -> abcd
|
||||
**
|
||||
** If the tile is 100% light grass the value is 0x5555.
|
||||
** If the tile is 3/4 light grass and dark grass in upper left corner
|
||||
** the value is 0x6555.
|
||||
**
|
||||
** @param x X map tile position
|
||||
** @param y Y map tile position
|
||||
**
|
||||
** @return the 'quad' of the tile.
|
||||
**
|
||||
** @todo Make a lookup table to speed up the things.
|
||||
*/
|
||||
local unsigned QuadFromTile(int x, int y)
|
||||
{
|
||||
int tile;
|
||||
int i;
|
||||
unsigned quad;
|
||||
unsigned mix;
|
||||
|
||||
//
|
||||
// find the abstact tile number
|
||||
//
|
||||
tile = TheMap.Fields[y * TheMap.Width + x].Tile;
|
||||
for (i = 0; i < TheMap.Tileset->NumTiles; ++i) {
|
||||
if (tile == TheMap.Tileset->Table[i]) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
DebugCheck(i == TheMap.Tileset->NumTiles);
|
||||
|
||||
quad = TheMap.Tileset->BasicNameTable[i];
|
||||
mix = TheMap.Tileset->MixedNameTable[i];
|
||||
|
||||
DebugLevel3Fn("Tile %d:%04x %d,%d\n" _C_ tile _C_ i _C_ quad _C_ mix);
|
||||
|
||||
if (!mix) { // a solid tile
|
||||
return quad | (quad << 8) | (quad << 16) | (quad << 24);
|
||||
}
|
||||
//
|
||||
// Mixed tiles, mix together
|
||||
//
|
||||
switch ((i & 0x00F0) >> 4) {
|
||||
case 0:
|
||||
return (quad << 24) | (mix << 16) | (mix << 8) | mix;
|
||||
case 1:
|
||||
return (mix << 24) | (quad << 16) | (mix << 8) | mix;
|
||||
case 2:
|
||||
return (quad << 24) | (quad << 16) | (mix << 8) | mix;
|
||||
case 3:
|
||||
return (mix << 24) | (mix << 16) | (quad << 8) | mix;
|
||||
case 4:
|
||||
return (quad << 24) | (mix << 16) | (quad << 8) | mix;
|
||||
case 5:
|
||||
return (quad << 24) | (quad << 16) | (quad << 8) | mix;
|
||||
case 6:
|
||||
return (quad << 24) | (quad << 16) | (quad << 8) | mix;
|
||||
case 7:
|
||||
return (mix << 24) | (mix << 16) | (mix << 8) | quad;
|
||||
case 8:
|
||||
return (quad << 24) | (mix << 16) | (mix << 8) | quad;
|
||||
case 9:
|
||||
return (mix << 24) | (quad << 16) | (mix << 8) | quad;
|
||||
case 10:
|
||||
return (quad << 24) | (quad << 16) | (mix << 8) | quad;
|
||||
case 11:
|
||||
return (mix << 24) | (mix << 16) | (quad << 8) | quad;
|
||||
case 12:
|
||||
return (quad << 24) | (mix << 16) | (quad << 8) | quad;
|
||||
case 13:
|
||||
return (mix << 24) | (quad << 16) | (quad << 8) | quad;
|
||||
}
|
||||
|
||||
DebugCheck( 1 );
|
||||
|
||||
return quad | (quad << 8) | (quad << 16) | (quad << 24);
|
||||
}
|
||||
|
||||
/**
|
||||
** Find a tile path.
|
||||
**
|
||||
** @param base Start tile type.
|
||||
** @param goal Goal tile type.
|
||||
** @param length Best found path length.
|
||||
** @param marks Already visited tile types.
|
||||
** @param tile Tile pointer.
|
||||
*/
|
||||
local int FindTilePath(int base, int goal, int length, char* marks, int* tile)
|
||||
{
|
||||
int i;
|
||||
int l;
|
||||
int j;
|
||||
int n;
|
||||
|
||||
//
|
||||
// Find any mixed tile
|
||||
//
|
||||
l = INT_MAX;
|
||||
for (i = 0; i < TheMap.Tileset->NumTiles;) {
|
||||
// goal found.
|
||||
if (base == TheMap.Tileset->BasicNameTable[i]
|
||||
&& goal == TheMap.Tileset->MixedNameTable[i]) {
|
||||
*tile = i;
|
||||
return length;
|
||||
}
|
||||
// goal found.
|
||||
if (goal == TheMap.Tileset->BasicNameTable[i]
|
||||
&& base == TheMap.Tileset->MixedNameTable[i]) {
|
||||
*tile = i;
|
||||
return length;
|
||||
}
|
||||
|
||||
// possible path found
|
||||
if (base == TheMap.Tileset->BasicNameTable[i]
|
||||
&& TheMap.Tileset->MixedNameTable[i]) {
|
||||
j = TheMap.Tileset->MixedNameTable[i];
|
||||
if (!marks[j]) {
|
||||
marks[j] = j;
|
||||
n = FindTilePath(j, goal, length + 1, marks, &n);
|
||||
marks[j] = 0;
|
||||
if (n < l) {
|
||||
*tile = i;
|
||||
l = n;
|
||||
}
|
||||
}
|
||||
// possible path found
|
||||
} else if (TheMap.Tileset->BasicNameTable[i]
|
||||
&& base == TheMap.Tileset->MixedNameTable[i]) {
|
||||
j = TheMap.Tileset->BasicNameTable[i];
|
||||
if (!marks[j]) {
|
||||
marks[j] = j;
|
||||
n = FindTilePath(j, goal, length + 1, marks, &n);
|
||||
marks[j] = 0;
|
||||
if (n < l) {
|
||||
*tile = i;
|
||||
l = n;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Advance solid or mixed.
|
||||
if (!TheMap.Tileset->MixedNameTable[i]) {
|
||||
i += 16;
|
||||
} else {
|
||||
i += 256;
|
||||
}
|
||||
}
|
||||
return l;
|
||||
}
|
||||
|
||||
/**
|
||||
** Get tile from quad.
|
||||
**
|
||||
** @param fixed Part can't be changed.
|
||||
** @param quad Quad of the tile type.
|
||||
** @return Best matching tile.
|
||||
*/
|
||||
local int TileFromQuad(unsigned fixed, unsigned quad)
|
||||
{
|
||||
int i;
|
||||
int type1;
|
||||
int type2;
|
||||
int base;
|
||||
int direction;
|
||||
|
||||
// 0 1 2 3 4 5 6 7 8 9 A B C D E F
|
||||
char table[16] = { 0, 7, 3, 11, 1, 9, 5, 13, 0, 8, 4, 12, 2, 10, 6, 0 };
|
||||
|
||||
DebugLevel3Fn("%x %x\n" _C_ fixed _C_ quad);
|
||||
|
||||
//
|
||||
// Get tile type from fixed.
|
||||
//
|
||||
while (!(type1 = (fixed & 0xFF))) {
|
||||
fixed >>= 8;
|
||||
if (!fixed) {
|
||||
abort();
|
||||
}
|
||||
}
|
||||
fixed >>= 8;
|
||||
while (!(type2 = (fixed & 0xFF)) && fixed) {
|
||||
fixed >>= 8;
|
||||
}
|
||||
//
|
||||
// Need an second type.
|
||||
//
|
||||
if (!type2 || type2 == type1) {
|
||||
fixed = quad;
|
||||
while ((type2 = (fixed & 0xFF)) == type1 && fixed) {
|
||||
fixed >>= 8;
|
||||
}
|
||||
if (type1 == type2) { // Oooh a solid tile.
|
||||
find_solid:
|
||||
//
|
||||
// Find the solid tile
|
||||
//
|
||||
for (i = 0; i < TheMap.Tileset->NumTiles;) {
|
||||
if (type1 == TheMap.Tileset->BasicNameTable[i]
|
||||
&& !TheMap.Tileset->MixedNameTable[i]) {
|
||||
break;
|
||||
}
|
||||
// Advance solid or mixed.
|
||||
if (!TheMap.Tileset->MixedNameTable[i]) {
|
||||
i += 16;
|
||||
} else {
|
||||
i += 256;
|
||||
}
|
||||
}
|
||||
DebugCheck( i >= TheMap.Tileset->NumTiles );
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
DebugLevel3Fn("type1 %x type2 %x\n" _C_ type1 _C_ type2);
|
||||
|
||||
//
|
||||
// Need a mixed tile
|
||||
//
|
||||
for (i = 0; i < TheMap.Tileset->NumTiles;) {
|
||||
if (type1 == TheMap.Tileset->BasicNameTable[i]
|
||||
&& type2 == TheMap.Tileset->MixedNameTable[i]) {
|
||||
break;
|
||||
}
|
||||
if (type2 == TheMap.Tileset->BasicNameTable[i]
|
||||
&& type1 == TheMap.Tileset->MixedNameTable[i]) {
|
||||
// Other mixed
|
||||
type1 ^= type2;
|
||||
type2 ^= type1;
|
||||
type1 ^= type2;
|
||||
break;
|
||||
}
|
||||
// Advance solid or mixed.
|
||||
if (!TheMap.Tileset->MixedNameTable[i]) {
|
||||
i += 16;
|
||||
} else {
|
||||
i += 256;
|
||||
}
|
||||
}
|
||||
|
||||
if (i >= TheMap.Tileset->NumTiles) {
|
||||
char* marks;
|
||||
|
||||
DebugLevel3Fn("No good mix found\n");
|
||||
//
|
||||
// Find the best tile path.
|
||||
//
|
||||
marks=alloca(TheMap.Tileset->NumNames);
|
||||
memset(marks,0,TheMap.Tileset->NumNames);
|
||||
marks[type1]=type1;
|
||||
if (FindTilePath(type1,type2,0,marks,&i) == INT_MAX) {
|
||||
DebugLevel0Fn("Huch, no mix found!!!!!!!!!!!\n");
|
||||
goto find_solid;
|
||||
}
|
||||
if ( type1 == TheMap.Tileset->MixedNameTable[i]) {
|
||||
// Other mixed
|
||||
type1 ^= type2;
|
||||
type2 ^= type1;
|
||||
type1 ^= type2;
|
||||
}
|
||||
}
|
||||
|
||||
base = i;
|
||||
|
||||
direction = 0;
|
||||
if (((quad >> 24) & 0xFF) == type1) {
|
||||
direction |= 8;
|
||||
}
|
||||
if (((quad >> 16) & 0xFF) == type1) {
|
||||
direction |= 4;
|
||||
}
|
||||
if (((quad >> 8) & 0xFF) == type1) {
|
||||
direction |= 2;
|
||||
}
|
||||
if (((quad >> 0) & 0xFF) == type1) {
|
||||
direction |= 1;
|
||||
}
|
||||
|
||||
DebugLevel3Fn("%08x %x %x %d\n" _C_ quad _C_ type1 _C_ type2 _C_ direction);
|
||||
|
||||
return base | (table[direction] << 4);
|
||||
}
|
||||
|
||||
#define D_UP 8 /// Go up allowed
|
||||
#define D_DOWN 4 /// Go down allowed
|
||||
#define D_LEFT 2 /// Go left allowed
|
||||
#define D_RIGHT 1 /// Go right allowed
|
||||
|
||||
/**
|
||||
** Editor change tile.
|
||||
**
|
||||
** @param x X map tile coordinate.
|
||||
** @param y Y map tile coordinate.
|
||||
** @param tile Tile type to edit.
|
||||
** @param d Fix direction flag 8 up, 4 down, 2 left, 1 right.
|
||||
*/
|
||||
local void EditorChangeTile(int x, int y, int tile, int d)
|
||||
{
|
||||
MapField* mf;
|
||||
|
||||
DebugCheck(x < 0 || y < 0 || x >= TheMap.Width || y >= TheMap.Height);
|
||||
|
||||
ChangeTile(x, y, tile);
|
||||
|
||||
//
|
||||
// Change the flags
|
||||
//
|
||||
mf = &TheMap.Fields[y * TheMap.Width + x];
|
||||
mf->Flags &= ~(MapFieldHuman | MapFieldLandAllowed | MapFieldCoastAllowed |
|
||||
MapFieldWaterAllowed | MapFieldNoBuilding | MapFieldUnpassable |
|
||||
MapFieldWall | MapFieldRocks | MapFieldForest);
|
||||
|
||||
mf->Flags |= TheMap.Tileset->FlagsTable[tile];
|
||||
|
||||
UpdateMinimapSeenXY(x, y);
|
||||
UpdateMinimapXY(x, y);
|
||||
|
||||
EditorTileChanged2(x, y, d);
|
||||
}
|
||||
|
||||
/**
|
||||
** Update surroundings for tile changes.
|
||||
**
|
||||
** @param x Map X tile position of change.
|
||||
** @param y Map Y tile position of change.
|
||||
** @param d Fix direction flag 8 up, 4 down, 2 left, 1 right.
|
||||
*/
|
||||
local void EditorTileChanged2(int x, int y, int d)
|
||||
{
|
||||
unsigned quad;
|
||||
unsigned q2;
|
||||
unsigned u;
|
||||
int tile;
|
||||
MapField* mf;
|
||||
|
||||
quad = QuadFromTile(x, y);
|
||||
DebugLevel3Fn("%d,%d %08x %d\n" _C_ x _C_ y _C_ quad _C_
|
||||
TheMap.Fields[y * TheMap.Width + x].Tile);
|
||||
|
||||
//
|
||||
// Change the surrounding
|
||||
//
|
||||
|
||||
//
|
||||
// Special case 1) Walls.
|
||||
//
|
||||
mf = &TheMap.Fields[y * TheMap.Width + x];
|
||||
if (mf->Flags & MapFieldWall) {
|
||||
if (mf->Flags & MapFieldHuman) {
|
||||
mf->Value = UnitTypeHumanWall->_HitPoints;
|
||||
} else {
|
||||
mf->Value = UnitTypeOrcWall->_HitPoints;
|
||||
}
|
||||
MapFixWallTile(x + 0, y + 0);
|
||||
MapFixWallTile(x + 1, y + 0);
|
||||
MapFixWallTile(x + 0, y + 1);
|
||||
MapFixWallTile(x - 1, y + 0);
|
||||
MapFixWallTile(x + 0, y - 1);
|
||||
return;
|
||||
}
|
||||
|
||||
if (d&D_UP && y) {
|
||||
//
|
||||
// Insert into the bottom the new tile.
|
||||
//
|
||||
q2 = QuadFromTile(x, y - 1);
|
||||
u = (q2 & TH_QUAD_M) | ((quad >> 16) & BH_QUAD_M);
|
||||
if (u != q2) {
|
||||
DebugLevel3Fn("U+ %08x -> %08x\n" _C_ q2 _C_ u);
|
||||
tile = TileFromQuad(u & BH_QUAD_M, u);
|
||||
DebugLevel3Fn("= %08x\n" _C_ tile);
|
||||
EditorChangeTile(x, y - 1, tile, d&~D_DOWN);
|
||||
}
|
||||
}
|
||||
if (d&D_DOWN && y < TheMap.Height - 1) {
|
||||
//
|
||||
// Insert into the top the new tile.
|
||||
//
|
||||
q2 = QuadFromTile(x, y + 1);
|
||||
u = (q2 & BH_QUAD_M) | ((quad << 16) & TH_QUAD_M);
|
||||
if (u != q2) {
|
||||
DebugLevel3Fn("D+ %08x -> %08x\n" _C_ q2 _C_ u);
|
||||
tile = TileFromQuad(u & TH_QUAD_M, u);
|
||||
EditorChangeTile(x, y + 1, tile, d&~D_UP);
|
||||
}
|
||||
}
|
||||
if (d&D_LEFT && x) {
|
||||
//
|
||||
// Insert into the left the new tile.
|
||||
//
|
||||
q2 = QuadFromTile(x - 1, y);
|
||||
u = (q2 & LH_QUAD_M) | ((quad >> 8) & RH_QUAD_M);
|
||||
if (u != q2) {
|
||||
DebugLevel3Fn("L+ %08x -> %08x\n" _C_ q2 _C_ u);
|
||||
tile = TileFromQuad(u & RH_QUAD_M, u);
|
||||
EditorChangeTile(x - 1, y, tile, d&~D_RIGHT);
|
||||
}
|
||||
}
|
||||
if (d&D_RIGHT && x < TheMap.Width - 1) {
|
||||
//
|
||||
// Insert into the right the new tile.
|
||||
//
|
||||
q2 = QuadFromTile(x + 1, y);
|
||||
u = (q2 & RH_QUAD_M) | ((quad << 8) & LH_QUAD_M);
|
||||
if (u != q2) {
|
||||
DebugLevel3Fn("R+ %08x -> %08x\n" _C_ q2 _C_ u);
|
||||
tile = TileFromQuad(u & LH_QUAD_M, u);
|
||||
EditorChangeTile(x + 1, y, tile, d&~D_LEFT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
** Update surroundings for tile changes.
|
||||
**
|
||||
** @param x Map X tile position of change.
|
||||
** @param y Map Y tile position of change.
|
||||
*/
|
||||
global void EditorTileChanged(int x, int y)
|
||||
{
|
||||
EditorTileChanged2(x, y, 0xF);
|
||||
}
|
||||
|
||||
//@}
|
||||
|
|
|
|||
|
|
@ -319,6 +319,7 @@ local int DefineTilesetParseSolid(Tileset* tileset,int index,SCM list)
|
|||
tileset->Table[index+i]=gh_scm2int(data);
|
||||
tileset->FlagsTable[index+i]=f;
|
||||
tileset->BasicNameTable[index+i]=basic_name;
|
||||
tileset->MixedNameTable[index+i]=0;
|
||||
}
|
||||
while( i<16 ) {
|
||||
tileset->Table[index+i]=0;
|
||||
|
|
@ -423,11 +424,13 @@ local void DefineTilesetParseSlot(Tileset* tileset,SCM list)
|
|||
fprintf(stderr, "out of memory.\n");
|
||||
ExitFatal(-1);
|
||||
}
|
||||
tileset->TileNames = malloc(4);
|
||||
tileset->TileNames = malloc(sizeof(char*));
|
||||
if (!tileset->TileNames) {
|
||||
fprintf(stderr, "out of memory.\n");
|
||||
ExitFatal(-1);
|
||||
}
|
||||
tileset->TileNames[0] = strdup("unused");
|
||||
tileset->NumNames = 1;
|
||||
|
||||
//
|
||||
// Parse the list: (still everything could be changed!)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue