Permalink
Browse files

Updated documentation.

Removed unused/broken thumbnail functionality.
Fixed error in list.c error message.
  • Loading branch information...
1 parent 9beed48 commit 6001efcf2f4bd4500436efa011074c0799e77fb5 @DusteDdk committed Oct 11, 2012
Showing with 8 additions and 111 deletions.
  1. +7 −34 doc/install.txt
  2. +0 −40 dumplevelimages.c
  3. +0 −1 dumplevelimages.h
  4. +1 −1 list.c
  5. +0 −8 main.c
  6. +0 −7 tools/mime/wizznic.xml
  7. +0 −20 tools/wizznic-thumbnailwrapper.sh
View
41 doc/install.txt
@@ -1,12 +1,12 @@
Here's how to compile/install wizznic for the 3 officially supported platforms.
-------------------------------------------------------------------------------
-If your platform is not here, check readme, unofficial (but highly appreciated)
+If your platform is not here, check ports.txt, unofficial (but highly appreciated)
ports exist for other other platforms, some of which are listed there.
-You can find the latest releases for on the sourceforce project page:
-https://sourceforge.net/projects/wizznic/ under "Files".
-
+The latest builds are available at http://jenkins.cyberstalker.dk/job/Wizznic/
+these are cutting edge, and might not work as expected.
+The latest official releases are available at http://sf.net/projects/wizznic/
GP2X Wiz.
---------
@@ -25,8 +25,6 @@ my guess is by using cygwin.
Windows.
--------
-There should be a precompiled .exe for Windows. - Sometimes a day or two later
-because I'm not usally near a windows box.
Simply extract the file (you did that allready, didn't you!;)
and run one of the .bat files.
If you want to compile it yourself, you'll need to configure Code::Blocks
@@ -37,13 +35,10 @@ project file.
Linux.
------
-There is a precompiled .x86-32 bit binary in the source package, however
-this might not work with your distribution (either because you run 64 bit)
-or if you use another version of one of the libs that the program is compiled
-against. So theres a chance you'll have to compile it yourself which
-shouldn't be too hard.
+Precompiled 32 and 64 bit versions are available, Wizznic might also be in your
+distributions package system.
-You'll need SDL, SDL-mixer, SDL-image, a C compiler and Make or Code::Blocks.
+You'll need SDL, SDL-mixer, SDL-image, a gcc compiler and Make.
To compile in Code::Blocks, open the project file, and build the Linux target.
@@ -95,25 +90,3 @@ To compile with mame keymapping, add -DMAME_CTRL to the make command, or
add the define in codeblocks.
To change controls further or see keymappings, see input.c.
-
-Using the thumbnail-function in gnome:
---------------------------------------
-Wizznic can generate thumbnail images of level-files (.wzp) if you wish.
-You need the source version of the game because the script
-wizznic/tools/wizznic-thumbnailwrapper.sh is needed.
-Edit that script:
-WIZZNICPATH= should be the full path to your wizznic directory.
-
-Open gconf-editor and go to: desktop > gnome > thumbnailers, rightclick
-below "disable all" and select "New Key"
-Name: text@wizznic/command
-Type: String
-Value: /full/path/to/wizznic/tools/wizznic-thumbnailwrapper.sh %i %o %s
-Now close the gconf-editor and open it again, navigate to:
-desktop > gnome > thumbnailers > text@wizznic and add a new key:
-Name: enable
-Type: Boolean
-Value: True
-
-Now, copy the wizznic/tools/mime/wizznic.xml to /usr/share/mime/packages
-and run: sudo update-mime-database
View
40 dumplevelimages.c
@@ -87,46 +87,6 @@ void dumplevelimages(SDL_Surface* screen, const char* packName, int dumpStartIma
}
}
-void thumblevelimage(SDL_Surface* screen,const char* lvlfile, const char* outimg)
-{
- playField pf;
- cursorType cur;
-
- packSet(0);
-
- printf("Thumbnailer.\nDoing: %s >> %s\n",lvlfile,outimg);
- initCursor(&cur);
-
- if(!loadField(&pf, lvlfile ))
- {
- printf("Error: Couldn't init board.\n");
- return;
- }
-
- pf.levelInfo = mkLevelInfo( lvlfile );
-
- if(!initDraw(pf.levelInfo,screen))
- {
- printf("Error: Couldn't init graphics.\n");
- return;
- }
-
- //Switch off cursor graphics
- drawDisableCursor();
-
- //Draw the image
- draw(&cur,&pf, screen);
-
- //Save image
- tgaSave(screen, outimg);
-
- SDL_Flip(screen);
-
- // cleanUpDraw();
- freeField(&pf);
-
-}
-
void tgaSave(SDL_Surface* screen, const char* fileName)
{
SDL_LockSurface(screen);
View
1 dumplevelimages.h
@@ -21,6 +21,5 @@
#include <SDL/SDL.h>
void dumplevelimages(SDL_Surface* screen, const char* packName, int dumpStartImage);
void tgaSave(SDL_Surface* screen, const char* fileName);
-void thumblevelimage(SDL_Surface* screen,const char* lvlfile, const char* outimg);
#endif // DUMPLEVELIMAGES_H_INCLUDED
View
2 list.c
@@ -97,7 +97,7 @@ listItem* listRemoveItem(listItem* start, listItem* item)
}
prev=l;
}
- printf("listRemoveItem ERROR: no item (%p) found in list (%p)!\n");
+ printf("listRemoveItem ERROR: no item (%p) found in list (%p)!\n", (void*)item, (void*)start);
return(0);
}
View
8 main.c
@@ -53,7 +53,6 @@ int main(int argc, char *argv[])
{
int doScale=0;
int doDump=0;
- int doThumb=0;
int state=1; //Game, Menu, Editor, Quit
int sdlVideoModeFlags = SDL_SWSURFACE;
@@ -126,9 +125,6 @@ int main(int argc, char *argv[])
}
setting()->glEnable=0;
doDump=1;
- } else if(strcmp(argv[1], "-thumbnailer")==0 && argc==4)
- {
- doThumb=1;
} else if(strcmp(argv[1], "-f")==0)
{
sdlVideoModeFlags |= SDL_FULLSCREEN;
@@ -235,10 +231,6 @@ int main(int argc, char *argv[])
{
dumplevelimages(screen, argv[2], 0);
return(0);
- } else if(doThumb) //For the gnome-thumbnailing script
- {
- thumblevelimage(screen, argv[2], argv[3]);
- return(0);
}
#endif
View
7 tools/mime/wizznic.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="text/wizznic">
- <comment>Wizznic Level File </comment>
- <glob pattern="*.wzp"/>
- </mime-type>
-</mime-info>
View
20 tools/wizznic-thumbnailwrapper.sh
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-#The full path to your wizznic directory.
-WIZZNICPATH="/home/dusted/Desktop/Desktop/dusted/ting/Wiz/WizDev/wizznic/"
-
-LOG=/tmp/wizzthumb.log
-
-cd $WIZZNICPATH
-CMD="./wizznic -thumbnailer $1 $2"
-
-echo $CMD >> $LOG
-
-$CMD
-
-
-#resize and convert to png
-mv $2 $2.tga
-convert $2.tga -crop 230x230+86+4 -resize $3x$3 $2.png
-rm $2.tga
-cp $2.png $2

0 comments on commit 6001efc

Please sign in to comment.