← Back to branch summary

~ubuntu-branches/ubuntu/vivid/berusky/vivid

« back to all changes in this revision

Viewing changes to src/defines.h

  • Committer: Bazaar Package Importer
  • Author(s): Bart Martens
  • Date: 2011-08-27 08:09:19 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20110827080919-1a7tyg1mm3ndg5sp
Tags: 1.3-1
http://bugs.debian.org/605982
http://bugs.debian.org/616350
http://bugs.debian.org/616343
* New upstream release.
* Switch to dpkg-source 3.0 (quilt) format.
* debian/berusky.6: Added.  Closes: #605982.
* debian/patches/02_endian.diff: Removed.
* debian/patches/03_arraysize.diff: Removed.
* debian/patches/06_newline.diff: Removed.
* debian/patches/08_backspace.diff: Removed.
* debian/patches/09_hints.diff: Removed.
* debian/patches/10_typos.diff: Added.  Closes: #616350.
* debian/berusky.desktop: Updated.  Closes: #616343.
* debian/control: Build-Depends: libgtk2.0-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/defines.h
91
91
 
92
92
#define EDIT_ITEM_PICT_START_X    (EDIT_ITEM_START_X)
93
93
#define EDIT_ITEM_PICT_START_Y    (EDIT_ITEM_START_Y+EDIT_ITEM_DY+10)
 
94
 
 
95
#define EDIT_HELP_KEY_X           40
 
96
#define EDIT_HELP_KEY_DX          120
 
97
#define EDIT_HELP_START_Y         40
 
98
#define EDIT_HELP_DY              10
 
99
 
 
100
#define EDIT_HELP_MOUSE_X         460
 
101
 
94
102
/*
95
103
#define ITEM_MENU_X               (EDIT_ITEM_START_X)
96
104
#define ITEM_MENU_Y               (EDIT_ITEM_PICT_START_Y+80)
99
107
*/
100
108
#define CONSOLE_X                 (EDITOR_LAYER_STATUS_X)
101
109
#define CONSOLE_Y                 (EDIT_ITEM_PICT_START_Y+ITEM_SIZE_Y+5)
102
 
#define CONSOLE_DX                (EDITOR_RESOLUTION_X-CONSOLE_X)
 
110
#define CONSOLE_DX                (EDITOR_RESOLUTION_X-CONSOLE_X-200)
103
111
#define CONSOLE_LINES             2
104
112
 
105
113
#define LEVELSET_NUM              5
365
373
// -------------------------------------------------------
366
374
#define ANIM_NONE                   0
367
375
#define ANIM_QUEUE_FIRST            1
368
 
#define ANIM_QUEUE_LENGHT           50
 
376
#define ANIM_QUEUE_LENGHT           100
369
377
 
370
378
 
371
379
// Basic types
380
388
// -------------------------------------------------------
381
389
#define INI_FILE_NAME      "berusky.ini"
382
390
 
 
391
#ifdef LINUX
383
392
#define INI_USER_DIRECTORY "~/.berusky"
384
393
#define INI_USER_LEVELS    "~/.berusky/User"
385
 
#define INI_FILE_GLOBAL    "/var/games/berusky/berusky.ini"
386
 
#define INI_FILE_USER      "~/.berusky/berusky.ini"
387
 
#define INI_FILE_LOCAL     "./berusky.ini"
 
394
#define INI_FILE_GLOBAL    "/etc/berusky/"INI_FILE_NAME
 
395
#define INI_FILE_USER      "~/.berusky/"INI_FILE_NAME
 
396
#define INI_FILE_LOCAL     "./"INI_FILE_NAME
 
397
#elif WINDOWS
 
398
#define INI_USER_DIRECTORY "./"
 
399
#define INI_USER_LEVELS    "./"
 
400
#define INI_FILE_GLOBAL    INI_FILE_NAME
 
401
#define INI_FILE_USER      INI_FILE_NAME
 
402
#define INI_FILE_LOCAL     INI_FILE_NAME
 
403
#endif
388
404
 
389
405
#define INI_FILE          (config_file())
390
406