mirrors
/
hyperrogue
mirror of https://github.com/zenorogue/hyperrogue.git
1
0
Fork 0
Code Issues Releases Wiki Activity

changed some shmup:: to multi::

This commit is contained in:
Zeno Rogue 2019-09-06 08:17:38 +02:00
parent 848eb8f48b
commit f934943732
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
control.cpp
View File

@ -492,7 +492,7 @@ EX void handleKeyNormal(int sym, int uni) {
if(sym == '-' || sym == PSEUDOKEY_WHEELDOWN) { if(sym == '-' || sym == PSEUDOKEY_WHEELDOWN) {
actonrelease = false; actonrelease = false;
shmup::cpid = 0; multi::cpid = 0;
if(mouseover && if(mouseover &&
targetclick && (!shmup::on || numplayers() == 1) && targetRangedOrb(mouseover, forcetarget ? roMouseForce : roMouse)) { targetclick && (!shmup::on || numplayers() == 1) && targetRangedOrb(mouseover, forcetarget ? roMouseForce : roMouse)) {
} }

14
graph.cpp
View File

@ -2839,7 +2839,7 @@ bool drawMonster(const transmatrix& Vparam, int ct, cell *c, color_t col, bool m
else { else {
if(mirr) Vs = Vs * Mirror; if(mirr) Vs = Vs * Mirror;
} }
shmup::cpid = i; multi::cpid = i;
drawPlayerEffects(Vs, c, true); drawPlayerEffects(Vs, c, true);
if(!mmmon) return true; if(!mmmon) return true;
@ -7048,7 +7048,7 @@ EX void drawMarkers() {
orbToTarget = itNone; orbToTarget = itNone;
if(mouseover && targetclick) { if(mouseover && targetclick) {
shmup::cpid = 0; multi::cpid = 0;
orbToTarget = targetRangedOrb(mouseover, roCheck); orbToTarget = targetRangedOrb(mouseover, roCheck);
#if CAP_QUEUE #if CAP_QUEUE
if(orbToTarget == itOrbSummon) { if(orbToTarget == itOrbSummon) {
@ -7416,8 +7416,8 @@ EX void drawthemap() {
drawFlashes(); drawFlashes();
if(multi::players > 1 && !shmup::on) { if(multi::players > 1 && !shmup::on) {
if(shmup::centerplayer != -1) if(multi::centerplayer != -1)
cwtV = multi::whereis[shmup::centerplayer]; cwtV = multi::whereis[multi::centerplayer];
else { else {
hyperpoint h; hyperpoint h;
for(int i=0; i<3; i++) h[i] = 0; for(int i=0; i<3; i++) h[i] = 0;
@ -7431,10 +7431,10 @@ EX void drawthemap() {
} }
if(shmup::on) { if(shmup::on) {
if(shmup::players == 1) if(multi::players == 1)
cwtV = shmup::pc[0]->pat; cwtV = shmup::pc[0]->pat;
else if(shmup::centerplayer != -1) else if(multi::centerplayer != -1)
cwtV = shmup::pc[shmup::centerplayer]->pat; cwtV = shmup::pc[multi::centerplayer]->pat;
else { else {
hyperpoint h; hyperpoint h;
for(int i=0; i<3; i++) h[i] = 0; for(int i=0; i<3; i++) h[i] = 0;