Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert mapgen.h functions to use point #39229

Merged
merged 3 commits into from
Apr 4, 2020
Merged

Convert mapgen.h functions to use point #39229

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
04602bf
Add point overloads for mapgen.h functions
jbytheway Apr 3, 2020
9591d1e
Convert calls to mapgen functions
jbytheway Apr 3, 2020
ace1e2e
Port mapgen function implementations
jbytheway Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add point overloads for mapgen.h functions
  • Loading branch information
@jbytheway
jbytheway committed Apr 3, 2020
commit 04602bf7efc0520333a5c358cdb5398717e4de14
17 changes: 17 additions & 0 deletions src/mapgen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,18 +454,35 @@ bool connects_to( const oter_id &there, int dir );
void mapgen_rotate( map *m, oter_id terrain_type, bool north_is_down = false );
// wrappers for map:: functions
void line( map *m, const ter_id &type, int x1, int y1, int x2, int y2 );
void line( map *m, const ter_id &type, int x1, int y1, const point &p2 );
void line( map *m, const ter_id &type, const point &p1, const point &p2 );
void line_furn( map *m, const furn_id &type, int x1, int y1, int x2, int y2 );
void line_furn( map *m, const furn_id &type, int x1, int y1, const point &p2 );
void line_furn( map *m, const furn_id &type, const point &p1, const point &p2 );
void fill_background( map *m, const ter_id &type );
void fill_background( map *m, ter_id( *f )() );
void square( map *m, const ter_id &type, int x1, int y1, int x2, int y2 );
void square( map *m, const ter_id &type, int x1, int y1, const point &p2 );
void square( map *m, const ter_id &type, const point &p1, const point &p2 );
void square( map *m, ter_id( *f )(), int x1, int y1, int x2, int y2 );
void square( map *m, ter_id( *f )(), int x1, int y1, const point &p2 );
void square( map *m, ter_id( *f )(), const point &p1, const point &p2 );
void square( map *m, const weighted_int_list<ter_id> &f, int x1, int y1, int x2, int y2 );
void square( map *m, const weighted_int_list<ter_id> &f, int x1, int y1, const point &p2 );
void square( map *m, const weighted_int_list<ter_id> &f, const point &p1, const point &p2 );
void square_furn( map *m, const furn_id &type, int x1, int y1, int x2, int y2 );
void square_furn( map *m, const furn_id &type, int x1, int y1, const point &p2 );
void square_furn( map *m, const furn_id &type, const point &p1, const point &p2 );
void rough_circle( map *m, const ter_id &type, int x, int y, int rad );
void rough_circle( map *m, const ter_id &type, const point &, int rad );
void rough_circle_furn( map *m, const furn_id &type, int x, int y, int rad );
void rough_circle_furn( map *m, const furn_id &type, const point &, int rad );
void circle( map *m, const ter_id &type, double x, double y, double rad );
void circle( map *m, const ter_id &type, int x, int y, int rad );
void circle( map *m, const ter_id &type, const point &, int rad );
void circle_furn( map *m, const furn_id &type, int x, int y, int rad );
void circle_furn( map *m, const furn_id &type, const point &, int rad );
void add_corpse( map *m, int x, int y );
void add_corpse( map *m, const point & );

#endif