More messing around with the level editor, changed windowmanager icon.

leveleditor.c

@@ -113,13 +113,13 @@ void editorRemoveBrickUnderCursor()
   {
     free(pf.board[cur.x][cur.y]);
     pf.board[cur.x][cur.y]=0;
-    changed=1;
   }
 
   //teleport?
   teleRemoveFromList(pf.levelInfo->teleList,cur.x,cur.y);
 
   boardSetWalls(&pf);
+  changed=1;
 }
 
 
@@ -196,19 +196,22 @@ int runEditor(SDL_Surface* screen)
         selBrick=NUMTILES;
     }
 
-    if( (getButton(C_BTNX) || isPointerClicked() ) && selBrick != RESERVED )
+    if( (getButton(C_BTNX) || getInpPointerState()->isDown ) && selBrick != RESERVED )
     {
-      resetBtn(C_BTNX);
-      resetMouseBtn();
+      //resetBtn(C_BTNX);
+      //resetMouseBtn();
 
-      //If it's empty and we are not placing a teledestination, remove brick at cursor
-      if(pf.board[cur.x][cur.y] && !(selBrick==TELESRC && teleState!=0) )
+      //We remove the brick under the cursor if it's not a teleport, or if it is and we are placing a teleport source.
+      if( (!telePresent(pf.levelInfo->teleList, cur.x, cur.y ) && selBrick!=TELESRC) || (selBrick==TELESRC && telePresent(pf.levelInfo->teleList, cur.x, cur.y ) && teleState==0 ) )
       {
         editorRemoveBrickUnderCursor();
       }
 
       if(selBrick==TELESRC)
       {
+        resetMouseBtn();
+        resetBtn(C_BTNX);
+
         if(teleState==0)
         {
           //Save source pos
@@ -234,22 +237,23 @@ int runEditor(SDL_Surface* screen)
 
     if( getButton(C_BTNY) )
     {
-      resetBtn(C_BTNY);
-
-      if(selBrick!=RESERVED)
+      //If we are trying to remove an empty teleport
+      if(telePresent(pf.levelInfo->teleList, cur.x, cur.y) && selBrick!=TELESRC)
       {
-        editorPickBrickUnderCursor();
+        resetBtn(C_BTNY);
+        selBrick=TELESRC;
+      } else {
+        if(selBrick!=RESERVED)
+        {
+          editorPickBrickUnderCursor();
+        }
+        editorRemoveBrickUnderCursor();
       }
-      editorRemoveBrickUnderCursor();
     }
 
-    if( isPointerClicked() )
+    if( getInpPointerState()->isDown && selBrick==RESERVED )
     {
-      resetMouseBtn();
-      if(selBrick==RESERVED)
-      {
-        editorRemoveBrickUnderCursor();
-      }
+      editorRemoveBrickUnderCursor();
     }
 
     if(getButton(C_BTNSELECT))

pointer.h

@@ -36,6 +36,7 @@ inline inpPointerState_t* getInpPointerState();
 
 int_fast8_t isPointerClicked(); //This does not take into account if the pointer actually hit anything
 int_fast8_t isAnyBoxHit(); //This will return true if any of the calls to isBoxClicked did this tick.
+int_fast8_t isPointerInBox( SDL_Rect* r );
 int_fast8_t isBoxClicked( SDL_Rect* r );
 
 int_fast8_t isPointerEscapeClicked(); //Returns 1 if the "escbox" was hit and escEnable=1;

teleport.c

@@ -107,3 +107,18 @@ char* teleMkStrings(listItem* l)
 
   return(str);
 }
+
+int_fast8_t telePresent( listItem* l, int sx,int sy)
+{
+  listItem* it = l;
+  telePort_t* t;
+  while( (it=it->next) )
+  {
+    t = (telePort_t*)it->data;
+    if( t->sx==sx && t->sy==sy)
+    {
+      return(1);
+    }
+  }
+  return(0);
+}

teleport.h

@@ -31,6 +31,7 @@ void teleFreeList( listItem* l );
 void teleAddToList( listItem* l, int sx, int sy, int dx, int dy );
 void teleRemoveFromList( listItem* l, int sx, int sy );
 void teleAddFromString(listItem* l, const char* str); //Expects a string in the format sx,sy:dx,dy
-char* teleMkStrings(listItem* l);
+char* teleMkStrings(listItem* l);
+int_fast8_t telePresent( listItem* l, int sx,int sy);
 
 #endif // TELEPORT_H_INCLUDED