mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-24 17:10:36 +00:00
Code Issues Releases Wiki Activity

Fixed graphical items/kills in Euclidean. Made them larger. Updated v number to 9.4j.

Browse Source
This commit is contained in:
Zeno Rogue 2017-05-29 11:22:11 +02:00
parent 5f275b50ed
commit 04eefbdf03
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
graph.cpp
View File

@ -7412,9 +7412,10 @@ transmatrix atscreenpos(ld x, ld y, ld size) {
V[0][2] += (x - vid.xcenter); V[0][2] += (x - vid.xcenter);
V[1][2] += (y - vid.ycenter); V[1][2] += (y - vid.ycenter);
V[0][0] = size * 1.2; V[0][0] = size * 2 * crossf / hcrossf;
V[1][1] = size * 1.2; V[1][1] = size * 2 * crossf / hcrossf;
V[2][2] = vid.scrdist; V[2][2] = vid.scrdist;
if(euclid) V[2][2] /= EUCSCALE;
return V; return V;
} }
@ -7433,7 +7434,8 @@ bool displayglyph(int cx, int cy, int buttonsize, char glyph, int color, int qty
if(id >= ittypes) { if(id >= ittypes) {
eMonster m = eMonster(id - ittypes); eMonster m = eMonster(id - ittypes);
int bsize = buttonsize; int bsize = buttonsize;
if(m == moKrakenH) bsize /= 2; if(m == moKrakenH) bsize /= 3;
if(m == moKrakenT || m == moDragonTail) bsize /= 2;
if(m == moSlime) bsize = (2*bsize+1)/3; if(m == moSlime) bsize = (2*bsize+1)/3;
transmatrix V = atscreenpos(cx+buttonsize/2, cy, bsize); transmatrix V = atscreenpos(cx+buttonsize/2, cy, bsize);
int mcol = color; int mcol = color;
@ -7445,7 +7447,7 @@ bool displayglyph(int cx, int cy, int buttonsize, char glyph, int color, int qty
int bsize = buttonsize; int bsize = buttonsize;
if(glyph =='*') bsize *= 2; if(glyph =='*') bsize *= 2;
if(glyph == '$') bsize = (bsize*5+2)/3; if(glyph == '$') bsize = (bsize*5+2)/3;
if(glyph == 'o') bsize *= 2; if(glyph == 'o') bsize = (bsize*3+1)/2;
if(glyph == 't') bsize = bsize*5/2; if(glyph == 't') bsize = bsize*5/2;
if(it == itWarning) bsize *= 2; if(it == itWarning) bsize *= 2;
if(it == itBombEgg || it == itTrollEgg || it == itDodeca) bsize = bsize*3/2; if(it == itBombEgg || it == itTrollEgg || it == itDodeca) bsize = bsize*3/2;
@ -7453,7 +7455,7 @@ bool displayglyph(int cx, int cy, int buttonsize, char glyph, int color, int qty
int icol = color; int icol = color;
icol -= (color & 0xFCFCFC) >> 2; icol -= (color & 0xFCFCFC) >> 2;
int ic = itemclass(it); int ic = itemclass(it);
drawItemType(it, NULL, V, icol, (ic == IC_ORB || ic == IC_NAI) ? ticks*2 : (glyph == 't' && qty%5) ? ticks/2 : 0, false); drawItemType(it, NULL, V, icol, (ic == IC_ORB || ic == IC_NAI) ? ticks*2 : ((glyph == 't' && qty%5) || it == itOrbYendor) ? ticks/2 : 0, false);
} }
quickqueue(); quickqueue();
} }

12
init.cpp
View File

@ -1,6 +1,6 @@
#define VER "9.4i" #define VER "9.4j"
#define VERNUM 9409 #define VERNUM 9410
#define VERNUM_HEX 0x9409 #define VERNUM_HEX 0x9410
#define GEN_M 0 #define GEN_M 0
#define GEN_F 1 #define GEN_F 1
@ -182,6 +182,12 @@ typedef int SDL_Event;
#endif #endif
#ifdef NOLAMBDAS
#undef TOUR
#else
#include <functional>
#endif
#include <cmath> #include <cmath>
#include <time.h> #include <time.h>
#include <vector> #include <vector>