Permalink
Browse files

Nuked some windows-style newlines.

Tweaked brick-selection graphics.
  • Loading branch information...
1 parent 9d9321f commit 8aa1af411c82f4596a230204efaede22d489e0e0 @DusteDdk committed Jun 6, 2012
Showing with 9 additions and 7 deletions.
  1. +6 −6 cursor.h
  2. BIN data/editselbrick.png
  3. +3 −1 leveleditor.c
View
@@ -1,5 +1,5 @@
-#ifndef CONTROL_H_INCLUDED
-#define CONTROL_H_INCLUDED
+#ifndef CONTROL_H_INCLUDED
+#define CONTROL_H_INCLUDED
/************************************************************************
* This file is part of Wizznic. *
@@ -19,7 +19,7 @@
************************************************************************/
#include "defs.h"
-
+
struct cursor_t
{
int moving; //is cursor in travel
@@ -34,6 +34,6 @@ typedef struct cursor_t cursorType;
void updateCursor(cursorType* c); //Update cursor pixel pos if moving
int moveCursor(cursorType* c,int dirX, int dirY, int limit);
void initCursor(cursorType* c);
-void setCursor(cursorType* c, int x, int y);
-
-#endif // CONTROL_H_INCLUDED
+void setCursor(cursorType* c, int x, int y);
+
+#endif // CONTROL_H_INCLUDED
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -15,6 +15,7 @@
* along with Foobar. If not, see <http://www.gnu.org/licenses/>. *
************************************************************************/
+#include "settings.h"
#include "leveleditor.h"
#include "cursor.h"
#include "board.h"
@@ -364,7 +365,8 @@ int runEditor(SDL_Surface* screen)
if( editorState == EDITOR_BRICKS_SELECTION )
{
//Draw box for the bricks "24 px"
- drawSprite( screen, selBrickBgSprite, HSCREENW-78, HSCREENH-42 );
+// drawSprite( screen, selBrickBgSprite, HSCREENW-78, HSCREENH-42 );
+ SDL_BlitSurface(selBrickBG , NULL, screen, &(setting()->bgPos) );
//Draw a 3*6 grid
int px,py,bnum=BRICKSBEGIN;

0 comments on commit 8aa1af4

Please sign in to comment.