Skip to content

Commit

Permalink
Test reformat of all files
Browse files Browse the repository at this point in the history
  • Loading branch information
@flend
flend committed Aug 2, 2023
1 parent 814fce1 commit 3012417
Show file tree
Hide file tree
Showing 35 changed files with 34,252 additions and 34,677 deletions.
6,252 changes: 3,112 additions & 3,140 deletions src/brogue/Architect.c
View file

Large diffs are not rendered by default.

481 changes: 234 additions & 247 deletions src/brogue/Buttons.c
View file

Large diffs are not rendered by default.

2,868 changes: 1,406 additions & 1,462 deletions src/brogue/Combat.c
View file

Large diffs are not rendered by default.

391 changes: 199 additions & 192 deletions src/brogue/Dijkstra.c
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/brogue/Globals.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern const color deepWaterLightColor;

extern const color confusionGasColor;

extern color minersLightColor; //dynamic
extern color minersLightColor; // dynamic
extern const color basicLightColor;
extern const color torchLightColor;

Expand Down
98 changes: 52 additions & 46 deletions src/brogue/GlobalsBase.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@

#include "Rogue.h"

tcell tmap[DCOLS][DROWS]; // grids with info about the map
tcell tmap[DCOLS][DROWS]; // grids with info about the map
pcell pmap[DCOLS][DROWS];
short **scentMap;
cellDisplayBuffer displayBuffer[COLS][ROWS]; // used to optimize plotCharWithColor
cellDisplayBuffer displayBuffer[COLS][ROWS]; // used to optimize plotCharWithColor
short terrainRandomValues[DCOLS][DROWS][8];
short **safetyMap; // used to help monsters flee
short **allySafetyMap; // used to help allies flee
short **chokeMap; // used to assess the importance of the map's various chokepoints
const short nbDirs[8][2] = {{0,-1}, {0,1}, {-1,0}, {1,0}, {-1,-1}, {-1,1}, {1,-1}, {1,1}};
short **safetyMap; // used to help monsters flee
short **allySafetyMap; // used to help allies flee
short **chokeMap; // used to assess the importance of the map's various chokepoints
const short nbDirs[8][2] = {{0, -1}, {0, 1}, {-1, 0}, {1, 0}, {-1, -1}, {-1, 1}, {1, -1}, {1, 1}};
const short cDirs[8][2] = {{0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}, {-1, -1}, {-1, 0}, {-1, 1}};
short numberOfWaypoints;
levelData *levels;
Expand All @@ -50,15 +50,16 @@ item *floorItems;
item *packItems;
item *monsterItemsHopper;

char displayedMessage[MESSAGE_LINES][COLS*2];
char displayedMessage[MESSAGE_LINES][COLS * 2];
short messagesUnconfirmed;
char combatText[COLS * 2];
short messageArchivePosition;
archivedMessage messageArchive[MESSAGE_ARCHIVE_ENTRIES];

char currentFilePath[BROGUE_FILENAME_MAX];

char displayDetail[DCOLS][DROWS]; // used to make certain per-cell data accessible to external code (e.g. terminal adaptations)
char displayDetail[DCOLS]
[DROWS]; // used to make certain per-cell data accessible to external code (e.g. terminal adaptations)

#ifdef AUDIT_RNG
FILE *RNGLogFile;
Expand All @@ -71,53 +72,58 @@ unsigned long positionInPlaybackFile;
unsigned long lengthOfPlaybackFile;
unsigned long recordingLocation;
unsigned long maxLevelChanges;
char annotationPathname[BROGUE_FILENAME_MAX]; // pathname of annotation file
char annotationPathname[BROGUE_FILENAME_MAX]; // pathname of annotation file
uint64_t previousGameSeed;

const windowpos WINDOW_POSITION_DUNGEON_TOP_LEFT = { STAT_BAR_WIDTH + 3, MESSAGE_LINES + 2};
const windowpos WINDOW_POSITION_DUNGEON_TOP_LEFT = {STAT_BAR_WIDTH + 3, MESSAGE_LINES + 2};

// Red Green Blue RedRand GreenRand BlueRand Rand Dances?
// basic colors
const color white = {100, 100, 100, 0, 0, 0, 0, false};
const color gray = {50, 50, 50, 0, 0, 0, 0, false};
const color darkGray = {30, 30, 30, 0, 0, 0, 0, false};
const color veryDarkGray = {15, 15, 15, 0, 0, 0, 0, false};
const color black = {0, 0, 0, 0, 0, 0, 0, false};
const color yellow = {100, 100, 0, 0, 0, 0, 0, false};
const color darkYellow = {50, 50, 0, 0, 0, 0, 0, false};
const color teal = {30, 100, 100, 0, 0, 0, 0, false};
const color purple = {100, 0, 100, 0, 0, 0, 0, false};
const color darkPurple = {50, 0, 50, 0, 0, 0, 0, false};
const color brown = {60, 40, 0, 0, 0, 0, 0, false};
const color green = {0, 100, 0, 0, 0, 0, 0, false};
const color darkGreen = {0, 50, 0, 0, 0, 0, 0, false};
const color orange = {100, 50, 0, 0, 0, 0, 0, false};
const color darkOrange = {50, 25, 0, 0, 0, 0, 0, false};
const color blue = {0, 0, 100, 0, 0, 0, 0, false};
const color darkBlue = {0, 0, 50, 0, 0, 0, 0, false};
const color darkTurquoise = {0, 40, 65, 0, 0, 0, 0, false};
const color lightBlue = {40, 40, 100, 0, 0, 0, 0, false};
const color pink = {100, 60, 66, 0, 0, 0, 0, false};
const color darkPink = {50, 30, 33, 0, 0, 0, 0, false};
const color red = {100, 0, 0, 0, 0, 0, 0, false};
const color darkRed = {50, 0, 0, 0, 0, 0, 0, false};
const color tanColor = {80, 67, 15, 0, 0, 0, 0, false};
const color white = {100, 100, 100, 0, 0, 0, 0, false};
const color gray = {50, 50, 50, 0, 0, 0, 0, false};
const color darkGray = {30, 30, 30, 0, 0, 0, 0, false};
const color veryDarkGray = {15, 15, 15, 0, 0, 0, 0, false};
const color black = {0, 0, 0, 0, 0, 0, 0, false};
const color yellow = {100, 100, 0, 0, 0, 0, 0, false};
const color darkYellow = {50, 50, 0, 0, 0, 0, 0, false};
const color teal = {30, 100, 100, 0, 0, 0, 0, false};
const color purple = {100, 0, 100, 0, 0, 0, 0, false};
const color darkPurple = {50, 0, 50, 0, 0, 0, 0, false};
const color brown = {60, 40, 0, 0, 0, 0, 0, false};
const color green = {0, 100, 0, 0, 0, 0, 0, false};
const color darkGreen = {0, 50, 0, 0, 0, 0, 0, false};
const color orange = {100, 50, 0, 0, 0, 0, 0, false};
const color darkOrange = {50, 25, 0, 0, 0, 0, 0, false};
const color blue = {0, 0, 100, 0, 0, 0, 0, false};
const color darkBlue = {0, 0, 50, 0, 0, 0, 0, false};
const color darkTurquoise = {0, 40, 65, 0, 0, 0, 0, false};
const color lightBlue = {40, 40, 100, 0, 0, 0, 0, false};
const color pink = {100, 60, 66, 0, 0, 0, 0, false};
const color darkPink = {50, 30, 33, 0, 0, 0, 0, false};
const color red = {100, 0, 0, 0, 0, 0, 0, false};
const color darkRed = {50, 0, 0, 0, 0, 0, 0, false};
const color tanColor = {80, 67, 15, 0, 0, 0, 0, false};

// tile colors
const color rainbow = {-70, -70, -70, 170, 170, 170, 0, true};
const color rainbow = {-70, -70, -70, 170, 170, 170, 0, true};

// charm constants
const fixpt POW_0_CHARM_INCREMENT[] = { // 1.0
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536,
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536,
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536};
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536,
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536,
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536,
65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536, 65536};
const fixpt POW_120_CHARM_INCREMENT[] = { // 1.20^x fixed point, with x from 1 to 50 in increments of 1:
78643, 94371, 113246, 135895, 163074, 195689, 234827, 281792, 338151, 405781, 486937, 584325, 701190, 841428, 1009714, 1211657,
1453988, 1744786, 2093744, 2512492, 3014991, 3617989, 4341587, 5209905, 6251886, 7502263, 9002716, 10803259, 12963911, 15556694,
18668032, 22401639, 26881967, 32258360, 38710033, 46452039, 55742447, 66890937, 80269124, 96322949, 115587539, 138705047, 166446056,
199735268, 239682321, 287618785, 345142543, 414171051, 497005262, 596406314, 715687577};
78643, 94371, 113246, 135895, 163074, 195689, 234827, 281792, 338151,
405781, 486937, 584325, 701190, 841428, 1009714, 1211657, 1453988, 1744786,
2093744, 2512492, 3014991, 3617989, 4341587, 5209905, 6251886, 7502263, 9002716,
10803259, 12963911, 15556694, 18668032, 22401639, 26881967, 32258360, 38710033, 46452039,
55742447, 66890937, 80269124, 96322949, 115587539, 138705047, 166446056, 199735268, 239682321,
287618785, 345142543, 414171051, 497005262, 596406314, 715687577};
const fixpt POW_125_CHARM_INCREMENT[] = { // 1.25^x fixed point, with x from 1 to 50 in increments of 1:
81920, 102400, 128000, 160000, 200000, 250000, 312500, 390625, 488281, 610351, 762939, 953674, 1192092, 1490116, 1862645, 2328306,
2910383, 3637978, 4547473, 5684341, 7105427, 8881784, 11102230, 13877787, 17347234, 21684043, 27105054, 33881317, 42351647, 52939559,
66174449, 82718061, 103397576, 129246970, 161558713, 201948391, 252435489, 315544362, 394430452, 493038065, 616297582, 770371977,
962964972, 1203706215, 1504632769, 1880790961, 2350988701, 2938735877, 3673419846, 4591774807, 5739718509};
81920, 102400, 128000, 160000, 200000, 250000, 312500, 390625, 488281,
610351, 762939, 953674, 1192092, 1490116, 1862645, 2328306, 2910383, 3637978,
4547473, 5684341, 7105427, 8881784, 11102230, 13877787, 17347234, 21684043, 27105054,
33881317, 42351647, 52939559, 66174449, 82718061, 103397576, 129246970, 161558713, 201948391,
252435489, 315544362, 394430452, 493038065, 616297582, 770371977, 962964972, 1203706215, 1504632769,
1880790961, 2350988701, 2938735877, 3673419846, 4591774807, 5739718509};
19 changes: 9 additions & 10 deletions src/brogue/GlobalsBase.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/


extern tcell tmap[DCOLS][DROWS]; // grids with info about the map
extern pcell pmap[DCOLS][DROWS]; // grids with info about the map
extern tcell tmap[DCOLS][DROWS]; // grids with info about the map
extern pcell pmap[DCOLS][DROWS]; // grids with info about the map

// Returns a pointer to the `tcell` at the given position. The position must be in-bounds.
static inline tcell* tmapAt(pos p) {
static inline tcell *tmapAt(pos p) {
brogueAssert(p.x >= 0 && p.x < DCOLS && p.y >= 0 && p.y < DROWS);
return &tmap[p.x][p.y];
}
// Returns a pointer to the `pcell` at the given position. The position must be in-bounds.
static inline pcell* pmapAt(pos p) {
static inline pcell *pmapAt(pos p) {
brogueAssert(p.x >= 0 && p.x < DCOLS && p.y >= 0 && p.y < DROWS);
return &pmap[p.x][p.y];
}
Expand All @@ -42,13 +41,13 @@ extern const short nbDirs[8][2];
// The direction must not be `NO_DIRECTION`.
static inline pos posNeighborInDirection(pos p, enum directions direction_to_step) {
brogueAssert(direction_to_step >= 0 && direction_to_step < 8);
return (pos) { .x = p.x + nbDirs[direction_to_step][0], .y = p.y + nbDirs[direction_to_step][1] };
return (pos){.x = p.x + nbDirs[direction_to_step][0], .y = p.y + nbDirs[direction_to_step][1]};
}

extern short **scentMap;
extern cellDisplayBuffer displayBuffer[COLS][ROWS];
extern short terrainRandomValues[DCOLS][DROWS][8];
extern short **safetyMap; // used to help monsters flee
extern short **safetyMap; // used to help monsters flee
extern short **allySafetyMap;
extern short **chokeMap;

Expand All @@ -67,9 +66,9 @@ extern item *packItems;
extern item *monsterItemsHopper;
extern short numberOfWaypoints;

extern char displayedMessage[MESSAGE_LINES][COLS*2];
extern char displayedMessage[MESSAGE_LINES][COLS * 2];
extern short messagesUnconfirmed;
extern char combatText[COLS*2];
extern char combatText[COLS * 2];
extern short messageArchivePosition;
extern archivedMessage messageArchive[MESSAGE_ARCHIVE_ENTRIES];

Expand All @@ -89,7 +88,7 @@ extern unsigned long positionInPlaybackFile;
extern unsigned long lengthOfPlaybackFile;
extern unsigned long recordingLocation;
extern unsigned long maxLevelChanges;
extern char annotationPathname[BROGUE_FILENAME_MAX]; // pathname of annotation file
extern char annotationPathname[BROGUE_FILENAME_MAX]; // pathname of annotation file
extern uint64_t previousGameSeed;

// basic colors
Expand Down
Loading

0 comments on commit 3012417

Please sign in to comment.