[Tux4kids-commits] r1703 - branches/commonification/t4kcommon/trunk/src
B. Luchen
cheezmeister-guest at alioth.debian.org
Mon Dec 28 22:24:27 UTC 2009
Author: cheezmeister-guest
Date: 2009-12-28 22:24:27 +0000 (Mon, 28 Dec 2009)
New Revision: 1703
Added:
branches/commonification/t4kcommon/trunk/src/t4k-common.test.h
Modified:
branches/commonification/t4kcommon/trunk/src/CMakeLists.txt
branches/commonification/t4kcommon/trunk/src/t4k-globals.h
Log:
Modified: branches/commonification/t4kcommon/trunk/src/CMakeLists.txt
===================================================================
--- branches/commonification/t4kcommon/trunk/src/CMakeLists.txt 2009-12-28 19:07:17 UTC (rev 1702)
+++ branches/commonification/t4kcommon/trunk/src/CMakeLists.txt 2009-12-28 22:24:27 UTC (rev 1703)
@@ -57,10 +57,13 @@
INSTALL( TARGETS t4kcommon
DESTINATION ${TUXTYPE_DESTINATION_DIR}/t4kcommon )
-INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.h
+INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.test.h
+ RENAME t4k-common.h
DESTINATION include/t4kcommon)
-INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.h
+INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.test.h
+ RENAME t4k-common.h
DESTINATION ${TUXMATH_DESTINATION_DIR}/t4kcommon )
-INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.h
+INSTALL(FILES ${T4KCOMMON_SOURCE_DIR}/t4k-common.test.h
+ RENAME t4k-common.h
DESTINATION ${TUXTYPE_DESTINATION_DIR}/t4kcommon )
Added: branches/commonification/t4kcommon/trunk/src/t4k-common.test.h
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-common.test.h (rev 0)
+++ branches/commonification/t4kcommon/trunk/src/t4k-common.test.h 2009-12-28 22:24:27 UTC (rev 1703)
@@ -0,0 +1,190 @@
+/*
+ tux4kids-common
+
+ Library of common functions used in Tux4Kids games.
+
+ Part of "Tux4Kids" Project
+ http://www.tux4kids.com/
+
+ Copyright: See COPYING file that comes with this distribution.
+*/
+
+#ifndef TUX4KIDS_COMMON_H
+#define TUX4KIDS_COMMON_H
+
+#include "SDL.h"
+#include "SDL_image.h"
+#include "SDL_mixer.h"
+
+#if SDL_BYTEORDER == SDL_BIG_ENDIAN
+#define rmask 0xff000000
+#define gmask 0x00ff0000
+#define bmask 0x0000ff00
+#define amask 0x000000ff
+#else
+#define rmask 0x000000ff
+#define gmask 0x0000ff00
+#define bmask 0x00ff0000
+#define amask 0xff000000
+#endif
+
+//Hold off on gettext until we decide if we are really going to
+//use it from within t4kcommon - DSB
+#define _(String) String
+//#define _(String) gettext (String)
+
+typedef enum { false, true } bool;
+
+//extern const int debug_loaders;
+//extern const int debug_menu;
+//extern const int debug_menu_parser;
+//extern const int debug_sdl;
+//extern const int debug_all;
+
+/* FIXME: global vars such as screen should be hidden when all games
+ are using only getters (such as GetScreen() ) */
+extern SDL_Surface* screen;
+
+#define MAX_SPRITE_FRAMES 15
+
+typedef struct {
+ SDL_Surface *frame[MAX_SPRITE_FRAMES];
+ SDL_Surface *default_img;
+ int num_frames;
+ int cur;
+} sprite;
+
+/* from t4k-main.c */
+//void InitT4KCommon(int debug_flags);
+
+/* from tk4-menu.c */
+
+/* special values used by RunMenu. RUN_MAIN_MENU is a special
+ activity that can be used in .xml menu structures but should not
+ be declared in activities' lists.
+ RunMenu returning QUIT indicates that user decided to quit application while
+ running the menu. Returning STOP indicates that user pressed stop button. */
+enum { RUN_MAIN_MENU = -3, QUIT = -2, STOP = -1 };
+
+
+/* Windows is silly and defines some things to win32 calls. Perhaps we should
+** adopt some sort of prefix to get around this --BML
+*/
+#ifdef WIN32
+#undef LoadMenu
+#undef PlaySound
+#undef SetRect
+#undef LoadImage
+#endif
+
+extern SDL_Rect menu_rect, stop_rect, prev_rect, next_rect;
+extern SDL_Surface *stop_button, *prev_arrow, *next_arrow, *prev_gray, *next_gray;
+
+//void SetActivitiesList(int num, char** acts);
+//void SetMenuSounds(char* mus_path, Mix_Chunk* click, Mix_Chunk* hover);
+//void SetImagePathPrefix(char* pref);
+//
+//void CreateOneLevelMenu(int index, int items, char** item_names, char** sprite_names, char* title, char* trailer);
+//int RunMenu(int index, bool return_choice, void (*draw_background)(), int (*handle_event)(SDL_Event*), void (*handle_animations)(), int (*handle_activity)(int, int));
+//void PrerenderMenu(int index);
+//void PrerenderAll();
+//void LoadMenu(int index, const char* file_name);
+//void UnloadMenus(void);
+
+/* from tk4-sdl.c */
+
+/* For TransWipe(): */
+enum
+{
+ WIPE_BLINDS_VERT,
+ WIPE_BLINDS_HORIZ,
+ WIPE_BLINDS_BOX,
+ RANDOM_WIPE,
+ NUM_WIPES
+};
+
+//TODO most of these functions are documented...somewhere. That should end up
+//in this header eventually
+//SDL_Surface* GetScreen();
+//void DrawButton(SDL_Rect* target_rect, int radius, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+//void DrawButtonOn(SDL_Surface* target, SDL_Rect* target_rect, int radius, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+//SDL_Surface* CreateButton(int w, int h, int radius, Uint8 r, Uint8 g, Uint8 b, Uint8 a);
+//void RoundCorners(SDL_Surface* s, Uint16 radius);
+//
+//SDL_Surface* Flip(SDL_Surface *in, int x, int y);
+//SDL_Surface* Blend(SDL_Surface *S1, SDL_Surface *S2, float gamma);
+//
+//void FreeSurfaceArray(SDL_Surface** surfs, int length);
+//int inRect(SDL_Rect r, int x, int y);
+//void SetRect(SDL_Rect* rect, const float* pos);
+//void UpdateRect(SDL_Surface* surf, SDL_Rect* rect);
+//
+//void DarkenScreen(Uint8 bits);
+//void ChangeWindowSize(int new_res_x, int new_res_y);
+//void SwitchScreenMode(void);
+//
+//SDL_EventType WaitForEvent(SDL_EventMask events);
+//SDL_Surface* zoom(SDL_Surface* src, int new_w, int new_h);
+//
+//int TransWipe(const SDL_Surface* newbkg, int type, int segments, int duration);
+//void InitBlitQueue(void);
+//void ResetBlitQueue(void);
+//int AddRect(SDL_Rect* src, SDL_Rect* dst);
+//int DrawSprite(sprite* gfx, int x, int y);
+//int DrawObject(SDL_Surface* surf, int x, int y);
+//void UpdateScreen(int* frame);
+//int EraseSprite(sprite* img, SDL_Surface* curr_bkgd, int x, int y);
+//int EraseObject(SDL_Surface* surf, SDL_Surface* curr_bkgd, int x, int y);
+//
+///* Prototypes for t4k-sdl.c text functions */
+//int Setup_SDL_Text(void);
+//void Cleanup_SDL_Text(void);
+//SDL_Surface* BlackOutline(const char* t, int size, SDL_Color* c);
+//SDL_Surface* SimpleText(const char *t, int size, SDL_Color* col);
+//SDL_Surface* SimpleTextWithOffset(const char *t, int size, SDL_Color* col, int *glyph_offset);
+
+/* from tk4-loaders.c */
+#define IMG_REGULAR 0x01
+#define IMG_COLORKEY 0x02
+#define IMG_ALPHA 0x04
+#define IMG_MODES 0x07
+
+#define IMG_NOT_REQUIRED 0x10
+#define IMG_NO_PNG_FALLBACK 0x20
+
+
+//int CheckFile(const char* file);
+/**
+ * Add a path to search for data (in addition to t4kcommon's install path and
+ * the root directory) This affects how LoadImage and friends are able to
+ * find files.
+ */
+//void AddDataPrefix(const char* path);
+//
+//SDL_Surface* LoadImage(const char* file_name, int mode);
+//SDL_Surface* LoadScaledImage(const char* file_name, int mode, int width, int height);
+//SDL_Surface* LoadImageOfBoundingBox(const char* file_name, int mode, int max_width, int max_height);
+//
+//SDL_Surface* LoadBkgd(const char* file_name, int width, int height);
+//
+//sprite* LoadSprite(const char* name, int mode);
+//sprite* LoadScaledSprite(const char* name, int mode, int width, int height);
+//sprite* LoadSpriteOfBoundingBox(const char* name, int mode, int max_width, int max_height);
+//sprite* FlipSprite(sprite* in, int X, int Y);
+//void FreeSprite(sprite* gfx);
+//void NextFrame(sprite* s);
+//
+//Mix_Chunk* LoadSound(char* datafile);
+//Mix_Music* LoadMusic(char *datafile);
+//
+///* from tk4-loaders.c */
+//
+//void PlaySound(Mix_Chunk* sound);
+//void PlaySoundLoop(Mix_Chunk* sound, int loops);
+//void AudioHaltChannel( int channel );
+//void AudioMusicLoad(char* music_path, int loops);
+//void AudioMusicUnload();
+//bool IsPlayingMusic();
+//void AudioMusicPlay(Mix_Music *musicData, int loops);
+
+#endif
Modified: branches/commonification/t4kcommon/trunk/src/t4k-globals.h
===================================================================
--- branches/commonification/t4kcommon/trunk/src/t4k-globals.h 2009-12-28 19:07:17 UTC (rev 1702)
+++ branches/commonification/t4kcommon/trunk/src/t4k-globals.h 2009-12-28 22:24:27 UTC (rev 1703)
@@ -10,7 +10,9 @@
#ifndef GLOBALS_H
#define GLOBALS_H
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include "SDL.h"
More information about the Tux4kids-commits
mailing list