Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
RogueReborn
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mikhail Andrenkov
RogueReborn
Commits
cb9a7c4e
Commit
cb9a7c4e
authored
8 years ago
by
Ori Almog
Browse files
Options
Downloads
Patches
Plain Diff
Fixed the segfault
parent
9e3f7e86
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/coord.cpp
+2
-2
2 additions, 2 deletions
src/coord.cpp
src/include/coord.h
+1
-1
1 addition, 1 deletion
src/include/coord.h
src/include/level.h
+10
-6
10 additions, 6 deletions
src/include/level.h
src/level.cpp
+141
-7
141 additions, 7 deletions
src/level.cpp
src/tunnel.cpp
+11
-9
11 additions, 9 deletions
src/tunnel.cpp
with
165 additions
and
25 deletions
src/coord.cpp
+
2
−
2
View file @
cb9a7c4e
...
...
@@ -70,6 +70,6 @@ bool Coord::operator!=(const Coord& other) {
return
not
(
*
this
==
other
);
}
std
::
string
Coord
::
toString
(){
return
x
+
", "
+
y
;
std
::
string
Coord
::
toString
()
const
{
return
std
::
to_string
(
x
)
+
", "
+
std
::
to_string
(
y
)
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/include/coord.h
+
1
−
1
View file @
cb9a7c4e
...
...
@@ -24,7 +24,7 @@ class Coord {
bool
operator
!=
(
const
Coord
&
);
Coord
asScreen
();
Coord
copy
();
std
::
string
toString
();
std
::
string
toString
()
const
;
private:
int
x
,
y
;
static
const
int
MAPX
=
0
,
MAPY
=
2
;
...
...
This diff is collapsed.
Click to expand it.
src/include/level.h
+
10
−
6
View file @
cb9a7c4e
...
...
@@ -33,18 +33,19 @@ class Level {
// move a mob back in the turn clock equal to the amount specified
void
pushMob
(
Mob
*
,
int
);
//Performs BFS with diagonals
//Performs BFS with diagonals
, returns deltas
std
::
vector
<
Coord
>
bfsDiag
(
Coord
,
Coord
);
//Performs BFS without diagonals
//Performs BFS without diagonals
, returns deltas
std
::
vector
<
Coord
>
bfsPerp
(
Coord
,
Coord
);
//Gets a path given a delta vector and starting position
std
::
vector
<
Coord
>
getPath
(
std
::
vector
<
Coord
>
,
Coord
);
//Gets a delta vector based on a path and a start coord
std
::
vector
<
Coord
>
getDeltas
(
std
::
vector
<
Coord
>
,
Coord
);
//Given a coord, returns coords to which you can move to nearby (3x3 box)
std
::
vector
<
Coord
>
getAdjPassable
(
Coord
);
//Given a start and a delta direction, returns a coord of where something thrown would land
Coord
throwLocation
(
Coord
,
Coord
);
private
:
...
...
@@ -81,6 +82,9 @@ class Level {
//Add diagonal coords
void
addDiags
(
Coord
,
std
::
queue
<
Coord
>&
,
std
::
map
<
Coord
,
Coord
>&
);
//Add diagonal coords
//Try to add a coord to the q
void
tryAddPassable
(
Coord
,
std
::
queue
<
Coord
>&
,
std
::
map
<
Coord
,
Coord
>&
,
Coord
);
//Try to add a coord to the q
void
tryAdd
(
Coord
,
std
::
queue
<
Coord
>&
,
std
::
map
<
Coord
,
Coord
>&
,
Coord
);
};
This diff is collapsed.
Click to expand it.
src/level.cpp
+
141
−
7
View file @
cb9a7c4e
...
...
@@ -7,6 +7,8 @@
#include
<map>
#include
<math.h>
#include
<iostream>
#include
<algorithm>
#include
<iterator>
#include
"include/tiles.h"
#include
"include/level.h"
#include
"include/coord.h"
...
...
@@ -137,7 +139,6 @@ void Level::generate(PlayerChar player) {
//put monsters in current room
rooms
.
push_back
(
curRoom
);
curRoom
.
printInfo
(
i
);
}
//Used to say: If A -> B, then B -> A
...
...
@@ -172,7 +173,7 @@ void Level::generate(PlayerChar player) {
}
}
std
::
cout
<<
"I
formed
"
<<
tunnels
.
size
()
<<
" tunnels"
<<
std
::
endl
;
std
::
cout
<<
"I
'm made
"
<<
tunnels
.
size
()
<<
" tunnels"
<<
std
::
endl
;
for
(
Tunnel
t
:
tunnels
){
t
.
dig
(
*
this
);
...
...
@@ -221,17 +222,48 @@ void Level::addDiags(Coord current, std::queue<Coord>& deltas, std::map<Coord, C
tryAdd
(
current
,
deltas
,
parents
,
target
);
}
void
Level
::
tryAddPassable
(
Coord
current
,
std
::
queue
<
Coord
>&
deltas
,
std
::
map
<
Coord
,
Coord
>&
parents
,
Coord
target
){
if
(
target
[
0
]
>
0
&&
target
[
0
]
<
size
[
0
]
&&
target
[
1
]
>
0
&&
target
[
1
]
<
size
[
1
]){
if
(
tiles
[
target
[
0
]][
target
[
1
]].
isPassable
()
==
Terrain
::
Passable
&&
!
tiles
[
target
[
0
]][
target
[
1
]].
checked
){
deltas
.
push
(
target
.
copy
());
tiles
[
target
[
0
]][
target
[
1
]].
checked
=
true
;
Coord
t_
=
target
.
copy
();
Coord
c_
=
current
.
copy
();
parents
.
insert
(
std
::
make_pair
(
t_
,
c_
));
}
}
}
void
Level
::
tryAdd
(
Coord
current
,
std
::
queue
<
Coord
>&
deltas
,
std
::
map
<
Coord
,
Coord
>&
parents
,
Coord
target
){
if
(
tiles
[
target
[
0
]][
target
[
1
]].
isPassable
()
==
Terrain
::
Passable
&&
!
tiles
[
target
[
0
]][
target
[
1
]].
checked
){
deltas
.
push
(
target
.
copy
());
tiles
[
target
[
0
]][
target
[
1
]].
checked
=
true
;
parents
[
target
.
copy
()]
=
current
.
copy
();
if
(
target
[
0
]
>
0
&&
target
[
0
]
<
size
[
0
]
&&
target
[
1
]
>
0
&&
target
[
1
]
<
size
[
1
]){
if
(
!
tiles
[
target
[
0
]][
target
[
1
]].
checked
){
Coord
t_
=
target
.
copy
();
Coord
c_
=
current
.
copy
();
Coord
p_
=
target
.
copy
();
deltas
.
push
(
p_
);
tiles
[
target
[
0
]][
target
[
1
]].
checked
=
true
;
parents
.
insert
(
std
::
make_pair
(
t_
,
c_
));
}
}
}
std
::
vector
<
Coord
>
Level
::
bfsDiag
(
Coord
start
,
Coord
end
){
for
(
auto
x
=
0
;
x
<
size
[
0
];
x
++
)
{
for
(
auto
y
=
0
;
y
<
size
[
1
];
y
++
)
{
tiles
[
x
][
y
].
checked
=
false
;
}
}
std
::
map
<
Coord
,
Coord
>
parents
;
std
::
queue
<
Coord
>
delta
;
delta
.
push
(
start
.
copy
());
...
...
@@ -247,14 +279,116 @@ std::vector<Coord> Level::bfsDiag(Coord start, Coord end){
addPerps
(
current
,
delta
,
parents
);
addDiags
(
current
,
delta
,
parents
);
}
//TODO: Put this into its own function
std
::
vector
<
Coord
>
path
;
Coord
current
=
end
.
copy
();
while
(
current
!=
start
){
path
.
push_back
(
current
);
current
=
parents
[
current
].
copy
();
}
path
.
push_back
(
start
.
copy
());
return
path
;
}
std
::
vector
<
Coord
>
Level
::
bfsPerp
(
Coord
start
,
Coord
end
){
for
(
auto
x
=
0
;
x
<
size
[
0
];
x
++
)
{
for
(
auto
y
=
0
;
y
<
size
[
1
];
y
++
)
{
tiles
[
x
][
y
].
checked
=
false
;
}
}
std
::
map
<
Coord
,
Coord
>
parents
;
std
::
queue
<
Coord
>
delta
;
delta
.
push
(
start
.
copy
());
while
(
!
delta
.
empty
()){
Coord
current
=
delta
.
front
();
delta
.
pop
();
if
(
current
==
end
){
break
;
}
Coord
target
;
target
=
current
+
Coord
(
1
,
0
);
tryAdd
(
current
,
delta
,
parents
,
target
);
target
=
current
+
Coord
(
-
1
,
0
);
tryAdd
(
current
,
delta
,
parents
,
target
);
target
=
current
+
Coord
(
0
,
1
);
tryAdd
(
current
,
delta
,
parents
,
target
);
target
=
current
+
Coord
(
0
,
-
1
);
tryAdd
(
current
,
delta
,
parents
,
target
);
}
//TODO: Put this into its own function
std
::
vector
<
Coord
>
path
;
Coord
current
=
end
.
copy
();
/*
std::cout << "Parents:" << std::endl;
std::map<Coord, Coord>::iterator it = parents.begin();
while(it != parents.end())
{
std::cout << (it->first.toString()) << " ---> " << (it->second.toString()) << " (" << ((it->second)-(it->first)).toString() << ")" << std::endl;
it++;
}
std::cout << "Going from: " << start[0] << ", " << start[1] << std::endl;
std::cout << "Going to: " << end[0] << ", " << end[1] << std::endl;
*/
int
count
=
0
;
//std::cout << current[0] << ", " << current[1] << std::endl;
while
(
current
!=
start
){
Coord
c_
=
current
.
copy
();
path
.
push_back
(
c_
);
current
=
parents
[
current
].
copy
();
//std::cout << current[0] << ", " << current[1] << std::endl;
count
++
;
if
(
count
==
100
||
current
==
Coord
(
0
,
0
)){
std
::
cout
<<
"Oops"
<<
std
::
endl
;
break
;
}
}
path
.
push_back
(
start
.
copy
());
return
path
;
}
std
::
vector
<
Coord
>
Level
::
getPath
(
std
::
vector
<
Coord
>
delta
,
Coord
start
){
std
::
vector
<
Coord
>
Level
::
getDeltas
(
std
::
vector
<
Coord
>
path
,
Coord
start
){
std
::
vector
<
Coord
>
deltas
;
std
::
reverse
(
path
.
begin
(),
path
.
end
());
if
(
start
!=
path
[
0
]){
std
::
cout
<<
"Start != path[0]"
<<
std
::
endl
;
}
for
(
int
i
=
0
;
i
<
path
.
size
()
-
1
;
i
++
){
Coord
delta
=
path
[
i
+
1
]
-
path
[
i
];
deltas
.
push_back
(
delta
);
}
return
deltas
;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/tunnel.cpp
+
11
−
9
View file @
cb9a7c4e
...
...
@@ -64,7 +64,12 @@ void Tunnel::dig(Level& level){
Coord
target
=
posPlusDir
(
qDoor
,
dir
);
Coord
start
=
posPlusDir
(
pDoor
,
flip
(
dir
));
std
::
vector
<
Coord
>
path
;
//std::vector<Coord> path;
std
::
vector
<
Coord
>
path
=
level
.
bfsPerp
(
start
,
target
);
/*
//Coord nextPos = start.copy();
Coord current = start.copy();
...
...
@@ -101,18 +106,15 @@ void Tunnel::dig(Level& level){
} while (current != target || counter > 5000);
*/
//Haha! Who knows why this works >:)
gen
.
shuffle
(
&
path
);
Coord
step
=
start
.
copy
();
//Haha! Who knows why this works >:)
//gen.shuffle(&path);
level
[
step
]
=
Floor
();
for
(
Coord
delta
:
path
){
step
+=
delta
;
level
[
step
]
=
Floor
();
for
(
Coord
piece
:
path
){
level
[
piece
]
=
Floor
();
}
}
Coord
Tunnel
::
findNextStep
(
Coord
currPos
,
std
::
vector
<
std
::
vector
<
double
>>
map
){
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment